* LyX, The Document Processor
*
* Copyright 1995 Matthias Ettrich
- * Copyright 1995-2000 The LyX Team.
+ * Copyright 1995-2001 The LyX Team.
*
* ====================================================== */
#include <config.h>
-#include <cstdlib>
-#include <cctype>
-#include <algorithm>
-#include "layout.h"
-#include "lyxparagraph.h"
#include "lyxtext.h"
-#include "support/textutils.h"
-#include "insets/insetbib.h"
-#include "insets/insettext.h"
+#include "layout.h"
+#include "paragraph.h"
#include "lyx_gui_misc.h"
#include "gettext.h"
#include "bufferparams.h"
#include "buffer.h"
-#include "minibuffer.h"
#include "debug.h"
#include "lyxrc.h"
#include "LyXView.h"
-#include "lyxrow.h"
#include "Painter.h"
#include "tracer.h"
#include "font.h"
#include "encoding.h"
#include "lyxscreen.h"
#include "bufferview_funcs.h"
+#include "BufferView.h"
#include "language.h"
+#include "ParagraphParameters.h"
+#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 <algorithm>
using std::max;
using std::min;
}
-int LyXText::GetRealCursorX(BufferView * bview) const
+int LyXText::workWidth(BufferView * bview, Inset * inset) const
+{
+ Paragraph * par = 0;
+ Paragraph::size_type pos = 0;
+
+ Buffer::inset_iterator it = bview->buffer()->inset_iterator_begin();
+
+ for (; it != bview->buffer()->inset_iterator_end(); ++it) {
+ if (*it == inset) {
+ par = it.getPar();
+ pos = it.getPos();
+ break;
+ }
+ }
+ if (!par) {
+ return workWidth(bview);
+ }
+
+ LyXLayout const & layout =
+ textclasslist.Style(bview->buffer()->params.textclass,
+ par->getLayout());
+
+ 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();
if (the_locking_inset && (the_locking_inset->getLyXText(bview)!=this))
- x = the_locking_inset->getLyXText(bview)->GetRealCursorX(bview);
+ x = the_locking_inset->getLyXText(bview)->getRealCursorX(bview);
return x;
}
-unsigned char LyXText::TransformChar(unsigned char c, LyXParagraph * par,
- LyXParagraph::size_type pos) const
+unsigned char LyXText::transformChar(unsigned char c, Paragraph * par,
+ Paragraph::size_type pos) const
{
if (!Encodings::is_arabic(c))
if (lyxrc.font_norm_type == LyXRC::ISO_8859_6_8 && isdigit(c))
else
return c;
- unsigned char const prev_char = pos > 0 ? par->GetChar(pos-1) : ' ';
+ unsigned char const prev_char = pos > 0 ? par->getChar(pos-1) : ' ';
unsigned char next_char = ' ';
-#ifndef NEW_INSETS
- for (LyXParagraph::size_type i = pos+1; i < par->Last(); ++i)
-#else
- for (LyXParagraph::size_type i = pos+1; i < par->size(); ++i)
-#endif
- if (!Encodings::IsComposeChar_arabic(par->GetChar(i))) {
- next_char = par->GetChar(i);
+
+ for (Paragraph::size_type i = pos+1; i < par->size(); ++i)
+ if (!Encodings::IsComposeChar_arabic(par->getChar(i))) {
+ next_char = par->getChar(i);
break;
}
//
// Lgb
-int LyXText::SingleWidth(BufferView * bview, LyXParagraph * par,
- LyXParagraph::size_type pos) const
+int LyXText::singleWidth(BufferView * bview, Paragraph * par,
+ Paragraph::size_type pos) const
{
- char const c = par->GetChar(pos);
- return SingleWidth(bview, par, pos, c);
+ char const c = par->getChar(pos);
+ return singleWidth(bview, par, pos, c);
}
-int LyXText::SingleWidth(BufferView * bview, LyXParagraph * par,
- LyXParagraph::size_type pos, char c) const
+int LyXText::singleWidth(BufferView * bview, Paragraph * par,
+ Paragraph::size_type pos, char c) const
{
- LyXFont const font = GetFont(bview->buffer(), par, pos);
+ LyXFont const font = getFont(bview->buffer(), par, pos);
// The most common case is handled first (Asger)
if (IsPrintable(c)) {
if (Encodings::IsComposeChar_arabic(c))
return 0;
else
- c = TransformChar(c, par, pos);
+ c = transformChar(c, par, pos);
else if (font.language()->lang() == "hebrew" &&
Encodings::IsComposeChar_hebrew(c))
return 0;
} else if (IsHfillChar(c)) {
return 3; /* Because of the representation
* as vertical lines */
-#ifndef NEW_INSETS
- } else if (c == LyXParagraph::META_FOOTNOTE ||
- c == LyXParagraph::META_MARGIN ||
- c == LyXParagraph::META_FIG ||
- c == LyXParagraph::META_TAB ||
- c == LyXParagraph::META_WIDE_FIG ||
- c == LyXParagraph::META_WIDE_TAB ||
- c == LyXParagraph::META_ALGORITHM) {
- string fs;
- switch (c) {
- case LyXParagraph::META_MARGIN:
- fs = "margin";
- break;
- case LyXParagraph::META_FIG:
- fs = "fig";
- break;
- case LyXParagraph::META_TAB:
- fs = "tab";
- break;
- case LyXParagraph::META_ALGORITHM:
- fs = "alg";
- break;
- case LyXParagraph::META_WIDE_FIG:
- fs = "wide-fig";
- break;
- case LyXParagraph::META_WIDE_TAB:
- fs = "wide-tab";
- break;
- case LyXParagraph::META_FOOTNOTE:
- fs = "foot";
- break;
- }
- font.decSize();
- font.decSize();
- return lyxfont::width(fs, font);
-#endif
- } else if (c == LyXParagraph::META_INSET) {
- Inset * tmpinset = par->GetInset(pos);
+ } else if (c == Paragraph::META_INSET) {
+ Inset * tmpinset = par->getInset(pos);
if (tmpinset) {
+#if 0 // seems not to be needed, but ...
tmpinset->update(bview, font);
+#endif
return tmpinset->width(bview, font);
} else
return 0;
// Returns the paragraph position of the last character in the specified row
-LyXParagraph::size_type LyXText::RowLast(Row const * row) const
+Paragraph::size_type LyXText::rowLast(Row const * row) const
{
-#ifndef NEW_INSETS
- if (row->next() == 0)
- return row->par()->Last() - 1;
- else if (row->next()->par() != row->par())
- return row->par()->Last() - 1;
- else
- return row->next()->pos() - 1;
-#else
if (row->next() == 0)
return row->par()->size() - 1;
else if (row->next()->par() != row->par())
return row->par()->size() - 1;
else
return row->next()->pos() - 1;
-#endif
}
-LyXParagraph::size_type LyXText::RowLastPrintable(Row const * row) const
+Paragraph::size_type LyXText::rowLastPrintable(Row const * row) const
{
- LyXParagraph::size_type const last = RowLast(row);
+ Paragraph::size_type const last = rowLast(row);
if (last >= row->pos()
&& row->next()
&& row->next()->par() == row->par()
- && row->par()->IsSeparator(last))
+ && row->par()->isSeparator(last))
return last - 1;
else
return last;
}
-void LyXText::ComputeBidiTables(Buffer const * buf, Row * row) const
+void LyXText::computeBidiTables(Buffer const * buf, Row * row) const
{
bidi_same_direction = true;
if (!lyxrc.rtl_support) {
}
bidi_start = row->pos();
- bidi_end = RowLastPrintable(row);
+ bidi_end = rowLastPrintable(row);
if (bidi_start > bidi_end) {
bidi_start = -1;
}
if (bidi_end + 2 - bidi_start >
- static_cast<LyXParagraph::size_type>(log2vis_list.size())) {
- LyXParagraph::size_type new_size =
+ static_cast<Paragraph::size_type>(log2vis_list.size())) {
+ Paragraph::size_type new_size =
(bidi_end + 2 - bidi_start < 500) ?
500 : 2 * (bidi_end + 2 - bidi_start);
log2vis_list.resize(new_size);
vis2log_list[bidi_end + 1 - bidi_start] = -1;
log2vis_list[bidi_end + 1 - bidi_start] = -1;
- LyXParagraph::size_type stack[2];
+ Paragraph::size_type stack[2];
bool const rtl_par =
row->par()->getParLanguage(buf->params)->RightToLeft();
int level = 0;
bool rtl = false;
bool rtl0 = false;
- LyXParagraph::size_type const main_body =
- BeginningOfMainBody(buf, row->par());
+ Paragraph::size_type const main_body =
+ beginningOfMainBody(buf, row->par());
- for (LyXParagraph::size_type lpos = bidi_start;
+ for (Paragraph::size_type lpos = bidi_start;
lpos <= bidi_end; ++lpos) {
- bool is_space = row->par()->IsLineSeparator(lpos);
- LyXParagraph::size_type const pos =
+ bool is_space = row->par()->isLineSeparator(lpos);
+ Paragraph::size_type const pos =
(is_space && lpos + 1 <= bidi_end &&
- !row->par()->IsLineSeparator(lpos + 1) &&
- !row->par()->IsNewline(lpos + 1))
+ !row->par()->isLineSeparator(lpos + 1) &&
+ !row->par()->isNewline(lpos + 1))
? lpos + 1 : lpos;
- LyXFont font = row->par()->GetFontSettings(buf->params, pos);
+ LyXFont font = row->par()->getFontSettings(buf->params, pos);
if (pos != lpos && 0 < lpos && rtl0 && font.isRightToLeft() &&
font.number() == LyXFont::ON &&
- row->par()->GetFontSettings(buf->params, lpos-1).number()
+ row->par()->getFontSettings(buf->params, lpos - 1).number()
== LyXFont::ON) {
- font = row->par()->GetFontSettings(buf->params, lpos);
+ font = row->par()->getFontSettings(buf->params, lpos);
is_space = false;
}
bidi_levels[lpos - bidi_start] = new_level;
while (level > new_level2) {
- LyXParagraph::size_type old_lpos =
+ Paragraph::size_type old_lpos =
stack[--level];
int delta = lpos - old_lpos - 1;
if (level % 2)
}
while (level > 0) {
- LyXParagraph::size_type const old_lpos = stack[--level];
+ Paragraph::size_type const old_lpos = stack[--level];
int delta = bidi_end - old_lpos;
if (level % 2)
delta = -delta;
log2vis_list[old_lpos - bidi_start] += delta;
}
- LyXParagraph::size_type vpos = bidi_start - 1;
- for (LyXParagraph::size_type lpos = bidi_start;
+ Paragraph::size_type vpos = bidi_start - 1;
+ for (Paragraph::size_type lpos = bidi_start;
lpos <= bidi_end; ++lpos) {
vpos += log2vis_list[lpos - bidi_start];
vis2log_list[vpos - bidi_start] = lpos;
// This method requires a previous call to ComputeBidiTables()
-bool LyXText::IsBoundary(Buffer const * buf, LyXParagraph * par,
- LyXParagraph::size_type pos) const
+bool LyXText::isBoundary(Buffer const * buf, Paragraph * par,
+ Paragraph::size_type pos) const
{
if (!lyxrc.rtl_support || pos == 0)
return false;
}
-bool LyXText::IsBoundary(Buffer const * buf, LyXParagraph * par,
- LyXParagraph::size_type pos,
+bool LyXText::isBoundary(Buffer const * buf, Paragraph * par,
+ Paragraph::size_type pos,
LyXFont const & font) const
{
if (!lyxrc.rtl_support)
void LyXText::draw(BufferView * bview, Row const * row,
- LyXParagraph::size_type & vpos,
- int offset, float & x, bool cleared)
+ Paragraph::size_type & vpos,
+ int offset, float & x, bool cleared)
{
Painter & pain = bview->painter();
- LyXParagraph::size_type pos = vis2log(vpos);
- char c = row->par()->GetChar(pos);
+ Paragraph::size_type pos = vis2log(vpos);
+ char c = row->par()->getChar(pos);
float tmpx = x;
if (IsNewlineChar(c)) {
++vpos;
// Draw end-of-line marker
- LyXFont const font = GetFont(bview->buffer(), row->par(), pos);
+ 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();
return;
}
- LyXFont font = GetFont(bview->buffer(), row->par(), pos);
+ LyXFont font = getFont(bview->buffer(), row->par(), pos);
LyXFont font2 = font;
-#ifndef NEW_INSETS
- if (c == LyXParagraph::META_FOOTNOTE
- || c == LyXParagraph::META_MARGIN
- || c == LyXParagraph::META_FIG
- || c == LyXParagraph::META_TAB
- || c == LyXParagraph::META_WIDE_FIG
- || c == LyXParagraph::META_WIDE_TAB
- || c == LyXParagraph::META_ALGORITHM) {
- string fs;
- switch (c) {
- case LyXParagraph::META_MARGIN:
- fs = "margin";
- break;
- case LyXParagraph::META_FIG:
- fs = "fig";
- break;
- case LyXParagraph::META_TAB:
- fs = "tab";
- break;
- case LyXParagraph::META_ALGORITHM:
- fs = "alg";
- break;
- case LyXParagraph::META_WIDE_FIG:
- fs = "wide-fig";
- break;
- case LyXParagraph::META_WIDE_TAB:
- fs = "wide-tab";
- break;
- case LyXParagraph::META_FOOTNOTE:
- fs = "foot";
- break;
- }
- font.decSize();
- font.decSize();
-
- // calculate the position of the footnotemark
- int const y = (row->baseline() - lyxfont::maxAscent(font2)
- + lyxfont::maxAscent(font));
-
- font.setColor(LColor::footnote);
-
- // draw it and set new x position
-
- pain.text(int(x), offset + y, fs, font);
- x += lyxfont::width(fs, font);
- pain.line(int(tmpx), offset + row->baseline(),
- int(x), offset + row->baseline(),
- LColor::footnote);
- ++vpos;
- return;
- } else
-#endif
- if (c == LyXParagraph::META_INSET) {
- Inset * tmpinset = row->par()->GetInset(pos);
+ if (c == Paragraph::META_INSET) {
+ Inset * tmpinset = row->par()->getInset(pos);
if (tmpinset) {
-// tmpinset->update(bview, font, false);
+ tmpinset->update(bview, font, false);
tmpinset->draw(bview, font, offset+row->baseline(), x,
- cleared);
-#ifdef SEEMS_TO_BE_NOT_NEEDED
- if (status == CHANGED_IN_DRAW) {
- UpdateInset(bview, tmpinset);
- status = CHANGED_IN_DRAW;
+ 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 *>(row);
}
-#endif
}
++vpos;
if (lyxrc.mark_foreign_language &&
+ font.language() != latex_language &&
font.language() != bview->buffer()->params.language) {
int const y = offset + row->height() - 1;
- pain.line(int(tmpx), y, int(x), y,
- LColor::language);
+ pain.line(int(tmpx), y, int(x), y, LColor::language);
}
return;
}
- /* usual characters, no insets */
+ // usual characters, no insets
// Collect character that we can draw in one command
textstring = c;
++vpos;
- LyXParagraph::size_type const last = RowLastPrintable(row);
+ 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 (LyXParagraph::size_type i = pos-1; i >= 0; --i) {
- c = row->par()->GetChar(i);
+ 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,
+ singleWidth(bview,
row->par(),
i, c);
dx = (c == 'ø' || c == 'ã') // dalet / resh
} else {
while (vpos <= last &&
(pos = vis2log(vpos)) >= 0
- && IsPrintableNonspace(c = row->par()->GetChar(pos))
+ && IsPrintableNonspace(c = row->par()->getChar(pos))
&& !Encodings::IsComposeChar_hebrew(c)
- && font2 == GetFont(bview->buffer(), row->par(), pos)) {
+ && font2 == getFont(bview->buffer(), row->par(), pos)) {
textstring += c;
++vpos;
}
(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);
+ c = transformChar(c, row->par(), pos);
textstring = c;
int const width = lyxfont::width(c, font2);
int dx = 0;
- for (LyXParagraph::size_type i = pos-1; i >= 0; --i) {
- c = row->par()->GetChar(i);
+ 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,
+ singleWidth(bview,
row->par(),
i, c);
dx = (width2 - width) / 2;
pain.text(int(x) + dx, offset + row->baseline(),
textstring, font);
} else {
- textstring = TransformChar(c, row->par(), pos);
+ textstring = transformChar(c, row->par(), pos);
while (vpos <= last &&
(pos = vis2log(vpos)) >= 0
- && IsPrintableNonspace(c = row->par()->GetChar(pos))
+ && IsPrintableNonspace(c = row->par()->getChar(pos))
&& !Encodings::IsComposeChar_arabic(c)
- && font2 == GetFont(bview->buffer(), row->par(), pos)) {
- c = TransformChar(c, row->par(), pos);
+ && font2 == getFont(bview->buffer(), row->par(), pos)) {
+ c = transformChar(c, row->par(), pos);
textstring += c;
++vpos;
}
} else {
while (vpos <= last &&
(pos = vis2log(vpos)) >= 0
- && IsPrintableNonspace(c = row->par()->GetChar(pos))
- && font2 == GetFont(bview->buffer(), row->par(), pos)) {
+ && IsPrintableNonspace(c = row->par()->getChar(pos))
+ && font2 == getFont(bview->buffer(), row->par(), pos)) {
textstring += c;
++vpos;
}
x += lyxfont::width(textstring, font);
}
+#ifdef INHERIT_LANGUAGE
+#ifdef WITH_WARNINGS
+ if ((font.language() == inherit_language) ||
+ (font.language() == ignore_language))
+ lyxerr << "No this shouldn't happen!\n";
+#endif
+#endif
if (lyxrc.mark_foreign_language &&
+ font.language() != latex_language &&
font.language() != bview->buffer()->params.language) {
int const y = offset + row->height() - 1;
pain.line(int(tmpx), y, int(x), y,
// 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
+int LyXText::leftMargin(BufferView * bview, Row const * row) const
{
- LyXLayout const & layout =
- textclasslist.Style(bview->buffer()->params.textclass,
- row->par()->GetLayout());
+ LyXTextClass const & tclass =
+ textclasslist.TextClass(bview->buffer()->params.textclass);
+ LyXLayout const & layout = tclass[row->par()->getLayout()];
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());
-#ifndef NEW_INSETS
- if (row->par()->footnoteflag == LyXParagraph::OPEN_FOOTNOTE) {
- LyXFont font(LyXFont::ALL_SANE);
- font.setSize(LyXFont::SIZE_SMALL);
- x += lyxfont::width("Mwide-figM", font)
- + LYX_PAPER_MARGIN/2;
- }
-#endif
+ 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()->getDepth()) {
+ if (!row->par()->getLayout()) {
// find the previous same level paragraph
-#ifndef NEW_INSETS
- if (row->par()->FirstPhysicalPar()->previous()) {
-#else
if (row->par()->previous()) {
-#endif
- LyXParagraph * newpar = row->par()
- ->DepthHook(row->par()->GetDepth());
+ Paragraph * newpar = row->par()
+ ->depthHook(row->par()->getDepth());
if (newpar &&
- textclasslist.Style(bview->buffer()->params.textclass,
- newpar->GetLayout())
- .nextnoindent)
+ tclass[newpar->getLayout()].nextnoindent)
parindent.erase();
}
}
} else {
// find the next level paragraph
- LyXParagraph * newpar =
- row->par()->DepthHook(row->par()->GetDepth()-1);
+ Paragraph * newpar =
+ row->par()->outerHook();
// make a corresponding row. Needed to call LeftMargin()
// check wether it is a sufficent paragraph
- if (newpar
-#ifndef NEW_INSETS
- && newpar->footnoteflag == row->par()->footnoteflag
-#endif
- && textclasslist
- .Style(bview->buffer()->params.textclass,
- newpar->GetLayout()).isEnvironment()) {
+ if (newpar && tclass[newpar->getLayout()].isEnvironment())
+ {
Row dummyrow;
dummyrow.par(newpar);
-#ifndef NEW_INSETS
- dummyrow.pos(newpar->Last());
-#else
dummyrow.pos(newpar->size());
-#endif
- x = LeftMargin(bview, &dummyrow);
+ x = leftMargin(bview, &dummyrow);
} else {
// this is no longer an error, because this function
// is used to clear impossible depths after changing
// a layout. Since there is always a redo,
// LeftMargin() is always called
-#ifndef NEW_INSETS
- row->par()->FirstPhysicalPar()->params.depth(0);
-#else
- row->par()->params.depth(0);
-#endif
+ row->par()->params().depth(0);
}
- if (newpar && !row->par()->GetLayout()) {
-#ifndef NEW_INSETS
- if (newpar->FirstPhysicalPar()->params.noindent())
-#else
- if (newpar->params.noindent())
-#endif
+ if (newpar && !row->par()->getLayout()) {
+ if (newpar->params().noindent())
parindent.erase();
else
- parindent = textclasslist
- .Style(bview->buffer()->params.textclass,
- newpar->GetLayout()).parindent;
+ parindent = tclass[newpar->getLayout()].parindent;
}
}
- LyXFont const labelfont = GetFont(bview->buffer(), row->par(), -2);
+ 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()) {
+ if (!row->par()->getLabelstring().empty()) {
x += lyxfont::signedWidth(layout.labelindent,
labelfont);
- x += lyxfont::width(row->par()->GetLabelstring(),
+ x += lyxfont::width(row->par()->getLabelstring(),
labelfont);
x += lyxfont::width(layout.labelsep, labelfont);
}
break;
case MARGIN_MANUAL:
x += lyxfont::signedWidth(layout.labelindent, labelfont);
- if (row->pos() >= BeginningOfMainBody(bview->buffer(), row->par())) {
- if (!row->par()->GetLabelWidthString().empty()) {
- x += lyxfont::width(row->par()->GetLabelWidthString(),
+ if (row->pos() >= beginningOfMainBody(bview->buffer(), row->par())) {
+ if (!row->par()->getLabelWidthString().empty()) {
+ x += lyxfont::width(row->par()->getLabelWidthString(),
labelfont);
x += lyxfont::width(layout.labelsep, labelfont);
}
}
break;
case MARGIN_STATIC:
- x += lyxfont::signedWidth(layout.leftmargin, textclasslist.TextClass(bview->buffer()->params.textclass).defaultfont()) * 4
- / (row->par()->GetDepth() + 4);
+ x += lyxfont::signedWidth(layout.leftmargin, tclass.defaultfont()) * 4
+ / (row->par()->getDepth() + 4);
break;
case MARGIN_FIRST_DYNAMIC:
if (layout.labeltype == LABEL_MANUAL) {
- if (row->pos() >= BeginningOfMainBody(bview->buffer(), row->par())) {
+ if (row->pos() >= beginningOfMainBody(bview->buffer(), row->par())) {
x += lyxfont::signedWidth(layout.leftmargin,
labelfont);
} else {
// theorems (JMarc)
|| (layout.labeltype == LABEL_STATIC
&& layout.latextype == LATEX_ENVIRONMENT
- && ! row->par()->IsFirstInSequence())) {
+ && ! row->par()->isFirstInSequence())) {
x += lyxfont::signedWidth(layout.leftmargin,
labelfont);
} else if (layout.labeltype != LABEL_TOP_ENVIRONMENT
x += lyxfont::signedWidth(layout.labelindent,
labelfont);
x += lyxfont::width(layout.labelsep, labelfont);
- x += lyxfont::width(row->par()->GetLabelstring(),
+ x += lyxfont::width(row->par()->getLabelstring(),
labelfont);
}
break;
}
x += lyxfont::signedWidth(layout.leftmargin,
- textclasslist
- .TextClass(bview->buffer()->params.textclass)
- .defaultfont());
+ tclass.defaultfont());
x += minfill;
}
break;
}
-#ifndef NO_PEXTRA
- if ((workWidth(bview) > 0) &&
- (row->par()->params.pextraType() == LyXParagraph::PEXTRA_INDENT)) {
- if (!row->par()->params.pextraWidthp().empty()) {
- x += workWidth(bview) *
- lyx::atoi(row->par()->params.pextraWidthp()) / 100;
- } else if (!row->par()->params.pextraWidth().empty()) {
- int xx = VSpace(row->par()->params.pextraWidth()).inPixels(bview);
- if (xx > workWidth(bview))
- xx = workWidth(bview) * 80 / 100;
- x += xx;
- } else { // should not happen
- LyXFont font(LyXFont::ALL_SANE);
- x += lyxfont::width("XXXXXX", font);
- }
- }
-#endif
- int align; // wrong type
-#ifndef NEW_INSETS
- if (row->par()->FirstPhysicalPar()->params.align() == LYX_ALIGN_LAYOUT)
- align = layout.align;
- else
- align = row->par()->FirstPhysicalPar()->params.align();
-#else
- if (row->par()->params.align() == LYX_ALIGN_LAYOUT)
+ LyXAlignment align; // wrong type
+
+ if (row->par()->params().align() == LYX_ALIGN_LAYOUT)
align = layout.align;
else
- align = row->par()->params.align();
-#endif
+ align = row->par()->params().align();
+
// set the correct parindent
if (row->pos() == 0) {
if ((layout.labeltype == LABEL_NO_LABEL
|| layout.labeltype == LABEL_CENTERED_TOP_ENVIRONMENT
|| (layout.labeltype == LABEL_STATIC
&& layout.latextype == LATEX_ENVIRONMENT
- && ! row->par()->IsFirstInSequence()))
-#ifndef NEW_INSETS
- && row->par() == row->par()->FirstPhysicalPar()
-#endif
+ && ! row->par()->isFirstInSequence()))
&& align == LYX_ALIGN_BLOCK
- && !row->par()->params.noindent()
+ && !row->par()->params().noindent()
&& (row->par()->layout ||
bview->buffer()->params.paragraph_separation ==
BufferParams::PARSEP_INDENT))
x += lyxfont::signedWidth(parindent,
- textclasslist
- .TextClass(bview->buffer()->params
- .textclass)
- .defaultfont());
+ tclass.defaultfont());
else if (layout.labeltype == LABEL_BIBLIO) {
- // ale970405 Right width for bibitems
- x += bibitemMaxWidth(bview,textclasslist
- .TextClass(bview->buffer()->params
- .textclass)
- .defaultfont());
+ // ale970405 Right width for bibitems
+ x += bibitemMaxWidth(bview, tclass.defaultfont());
}
}
return x;
}
-int LyXText::RightMargin(Buffer const * buf, Row const * row) const
+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.TextClass(buf->params.textclass);
+ LyXLayout const & layout = tclass[row->par()->getLayout()];
+
int x = LYX_PAPER_MARGIN
- + lyxfont::signedWidth(textclasslist
- .TextClass(buf->params.textclass)
- .rightmargin(),
- textclasslist
- .TextClass(buf->params.textclass)
- .defaultfont());
-
-#ifndef NEW_INSETS
- if (row->par()->footnoteflag == LyXParagraph::OPEN_FOOTNOTE) {
- x += LYX_PAPER_MARGIN / 2;
- }
-#endif
+ + 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()) {
+ if (row->par()->getDepth()) {
// find the next level paragraph
- LyXParagraph * newpar = row->par();
+ Paragraph * newpar = row->par();
-#ifndef NEW_INSETS
- do {
- newpar = newpar->FirstPhysicalPar()->previous();
- if (newpar)
- newpar = newpar->FirstPhysicalPar();
- } while (newpar && newpar->GetDepth() >= row->par()->GetDepth()
- && newpar->footnoteflag == row->par()->footnoteflag);
-#else
do {
newpar = newpar->previous();
} while (newpar
- && newpar->GetDepth() >= row->par()->GetDepth());
-#endif
+ && newpar->getDepth() >= row->par()->getDepth());
// make a corresponding row. Needed to call LeftMargin()
// check wether it is a sufficent paragraph
if (newpar
-#ifndef NEW_INSETS
- && newpar->footnoteflag == row->par()->footnoteflag
-#endif
- && textclasslist.Style(buf->params.textclass,
- newpar->GetLayout())
- .isEnvironment()) {
+ && tclass[newpar->getLayout()].isEnvironment()) {
Row dummyrow;
dummyrow.par(newpar);
dummyrow.pos(0);
- x = RightMargin(buf, &dummyrow);
+ x = rightMargin(buf, &dummyrow);
} else {
// this is no longer an error, because this function
// is used to clear impossible depths after changing
// a layout. Since there is always a redo,
// LeftMargin() is always called
-#ifndef NEW_INSETS
- row->par()->FirstPhysicalPar()->params.depth(0);
-#else
- row->par()->params.depth(0);
-#endif
+ 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
+int LyXText::labelEnd(BufferView * bview, Row const * row) const
{
if (textclasslist.Style(bview->buffer()->params.textclass,
- row->par()->GetLayout()).margintype
+ row->par()->getLayout()).margintype
== MARGIN_MANUAL) {
Row tmprow;
tmprow = *row;
-#ifndef NEW_INSETS
- tmprow.pos(row->par()->Last());
-#else
tmprow.pos(row->par()->size());
-#endif
- 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
// get the next breakpoint in a given paragraph
-LyXParagraph::size_type
-LyXText::NextBreakPoint(BufferView * bview, Row const * row, int width) const
+Paragraph::size_type
+LyXText::nextBreakPoint(BufferView * bview, Row const * row, int width) const
{
- LyXParagraph * par = row->par();
+ Paragraph * par = row->par();
if (width < 0)
-#ifndef NEW_INSETS
- return par->Last();
-#else
return par->size();
-#endif
- LyXParagraph::size_type const pos = row->pos();
+ Paragraph::size_type const pos = row->pos();
// position of the last possible breakpoint
// -1 isn't a suitable value, but a flag
- LyXParagraph::size_type last_separator = -1;
- width -= RightMargin(bview->buffer(), row);
+ Paragraph::size_type last_separator = -1;
+ width -= rightMargin(bview->buffer(), row);
- LyXParagraph::size_type const main_body =
- BeginningOfMainBody(bview->buffer(), par);
+ Paragraph::size_type const main_body =
+ beginningOfMainBody(bview->buffer(), par);
LyXLayout const & layout =
- textclasslist.Style(bview->buffer()->params.textclass, par->GetLayout());
- LyXParagraph::size_type i = pos;
+ textclasslist.Style(bview->buffer()->params.textclass,
+ par->getLayout());
+ Paragraph::size_type i = pos;
if (layout.margintype == MARGIN_RIGHT_ADDRESS_BOX) {
/* special code for right address boxes, only newlines count */
-#ifndef NEW_INSETS
- while (i < par->Last()) {
-#else
while (i < par->size()) {
-#endif
- if (par->IsNewline(i)) {
+ if (par->isNewline(i)) {
last_separator = i;
-#ifndef NEW_INSETS
- i = par->Last() - 1; // this means break
-#else
i = par->size() - 1; // this means break
-#endif
//x = width;
- } else if (par->GetChar(i) == LyXParagraph::META_INSET &&
- par->GetInset(i) && par->GetInset(i)->display()){
- par->GetInset(i)->display(false);
+ } else if (par->getChar(i) == Paragraph::META_INSET &&
+ par->getInset(i) && par->getInset(i)->display()){
+ par->getInset(i)->display(false);
}
++i;
}
} else {
// Last position is an invariant
-#ifndef NEW_INSETS
- LyXParagraph::size_type const last =
- par->Last();
-#else
- LyXParagraph::size_type const last =
+ Paragraph::size_type const last =
par->size();
-#endif
// this is the usual handling
- int x = LeftMargin(bview, row);
+ int x = leftMargin(bview, row);
bool doitonetime = true;
while (doitonetime || ((x < width) && (i < last))) {
doitonetime = false;
- char const c = par->GetChar(i);
+ char const c = par->getChar(i);
if (IsNewlineChar(c)) {
last_separator = i;
x = width; // this means break
- } else if (c == LyXParagraph::META_INSET &&
- par->GetInset(i)) {
+ } else if (c == Paragraph::META_INSET &&
+ par->getInset(i)) {
// check wether a Display() inset is
// valid here. if not, change it to
// non-display
- if (par->GetInset(i)->display() &&
+ if (par->getInset(i)->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);
- x += SingleWidth(bview, par, i, c);
- } else if (par->GetInset(i)->display() ||
- par->GetInset(i)->needFullRow()) {
+ par->getInset(i)->display(false);
+ x += singleWidth(bview, par, i, c);
+ } else if (par->getInset(i)->display() ||
+ par->getInset(i)->needFullRow()) {
// So break the line here
if (i == pos) {
if (pos < last-1) {
last_separator = i;
- if (IsLineSeparatorChar(par->GetChar(i+1)))
+ if (IsLineSeparatorChar(par->getChar(i+1)))
++last_separator;
} else
last_separator = last; // to avoid extra rows
last_separator = i - 1;
x = width; // this means break
} else {
-#if 0
- last_separator = i;
- x += width;
-#else
- x += SingleWidth(bview, par, i, c);
-#endif
+ x += singleWidth(bview, par, i, c);
}
} else {
if (IsLineSeparatorChar(c))
last_separator = i;
- x += SingleWidth(bview, par, i, c);
+ x += singleWidth(bview, par, i, c);
}
++i;
if (i == main_body) {
x += lyxfont::width(layout.labelsep,
- GetFont(bview->buffer(), par, -2));
- if (par->IsLineSeparator(i - 1))
- x-= SingleWidth(bview, par, i - 1);
- int left_margin = LabelEnd(bview, row);
+ getLabelFont(bview->buffer(), par));
+ if (par->isLineSeparator(i - 1))
+ x-= singleWidth(bview, par, i - 1);
+ int left_margin = labelEnd(bview, row);
if (x < left_margin)
x = left_margin;
}
// returns the minimum space a row needs on the screen in pixel
-int LyXText::Fill(BufferView * bview, Row * row, int paper_width) const
+int LyXText::fill(BufferView * bview, Row * row, int paper_width) const
{
if (paper_width < 0)
- return 20;
+ return 0;
int w;
// get the pure distance
- LyXParagraph::size_type const last = RowLastPrintable(row);
+ Paragraph::size_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) {
+ row->par()->getLayout()).margintype
+ == MARGIN_RIGHT_ADDRESS_BOX)
+ {
int const tmpfill = row->fill();
row->fill(0); // the minfill in MarginLeft()
- w = LeftMargin(bview, row);
+ w = leftMargin(bview, row);
row->fill(tmpfill);
} else
- w = LeftMargin(bview, row);
+ w = leftMargin(bview, row);
LyXLayout const & layout = textclasslist.Style(bview->buffer()->params.textclass,
- row->par()->GetLayout());
- LyXParagraph::size_type const main_body =
- BeginningOfMainBody(bview->buffer(), row->par());
- LyXParagraph::size_type i = row->pos();
+ row->par()->getLayout());
+ Paragraph::size_type const main_body =
+ beginningOfMainBody(bview->buffer(), row->par());
+ Paragraph::size_type i = row->pos();
while (i <= last) {
if (main_body > 0 && i == main_body) {
- w += lyxfont::width(layout.labelsep, GetFont(bview->buffer(), row->par(), -2));
- if (row->par()->IsLineSeparator(i - 1))
- w -= SingleWidth(bview, row->par(), i - 1);
- int left_margin = LabelEnd(bview, row);
+ w += lyxfont::width(layout.labelsep, getLabelFont(bview->buffer(), row->par()));
+ if (row->par()->isLineSeparator(i - 1))
+ w -= singleWidth(bview, row->par(), i - 1);
+ int left_margin = labelEnd(bview, row);
if (w < left_margin)
w = left_margin;
}
- w += SingleWidth(bview, row->par(), i);
+ w += singleWidth(bview, row->par(), i);
++i;
}
if (main_body > 0 && main_body > last) {
- w += lyxfont::width(layout.labelsep, GetFont(bview->buffer(), row->par(), -2));
- if (last >= 0 && row->par()->IsLineSeparator(last))
- w -= SingleWidth(bview, row->par(), last);
- int const left_margin = LabelEnd(bview, row);
+ w += lyxfont::width(layout.labelsep, getLabelFont(bview->buffer(), row->par()));
+ if (last >= 0 && row->par()->isLineSeparator(last))
+ w -= singleWidth(bview, row->par(), last);
+ int const left_margin = labelEnd(bview, row);
if (w < left_margin)
w = left_margin;
}
- int const fill = paper_width - w - RightMargin(bview->buffer(), row);
+ int const fill = paper_width - w - rightMargin(bview->buffer(), row);
+#ifdef WITH_WARNINGS
+#warning Please fix me (Jug!)
+#endif
+#if 0
if (fill < 0)
return 0;
+#endif
return fill;
}
// returns the minimum space a manual label needs on the screen in pixel
-int LyXText::LabelFill(BufferView * bview, Row const * row) const
+int LyXText::labelFill(BufferView * bview, Row const * row) const
{
- LyXParagraph::size_type last = BeginningOfMainBody(bview->buffer(), row->par()) - 1;
+ Paragraph::size_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.
// 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();
+ Paragraph::size_type i = row->pos();
while (i <= last) {
- w += SingleWidth(bview, row->par(), i);
+ w += singleWidth(bview, row->par(), i);
++i;
}
int fill = 0;
- if (!row->par()->params.labelWidthString().empty()) {
- fill = max(lyxfont::width(row->par()->params.labelWidthString(),
- GetFont(bview->buffer(), row->par(), -2)) - w,
+ if (!row->par()->params().labelWidthString().empty()) {
+ fill = max(lyxfont::width(row->par()->params().labelWidthString(),
+ getLabelFont(bview->buffer(), row->par())) - w,
0);
}
// 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
+int LyXText::numberOfSeparators(Buffer const * buf, Row const * row) const
{
- LyXParagraph::size_type const last = RowLast(row);
- LyXParagraph::size_type p =
- max(row->pos(), BeginningOfMainBody(buf, row->par()));
+ Paragraph::size_type const last = rowLast(row);
+ Paragraph::size_type p =
+ max(row->pos(), beginningOfMainBody(buf, row->par()));
int n = 0;
for (; p < last; ++p) {
- if (row->par()->IsSeparator(p)) {
+ if (row->par()->isSeparator(p)) {
++n;
}
}
// returns the number of hfills in the specified row. The LyX-Hfill is
// a LaTeX \hfill so that the hfills at the beginning and at the end were
// ignored. This is *MUCH* more usefull than not to ignore!
-int LyXText::NumberOfHfills(Buffer const * buf, Row const * row) const
+int LyXText::numberOfHfills(Buffer const * buf, Row const * row) const
{
- LyXParagraph::size_type const last = RowLast(row);
- LyXParagraph::size_type first = row->pos();
+ Paragraph::size_type const last = rowLast(row);
+ Paragraph::size_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()));
+ first = max(first, beginningOfMainBody(buf, row->par()));
int n = 0;
- for (int p = first; p <= last; ++p) { // last, because the end is ignored!
- if (row->par()->IsHfill(p)) {
+ for (Paragraph::size_type p = first; p <= last; ++p) {
+ // last, because the end is ignored!
+ if (row->par()->isHfill(p)) {
++n;
}
}
// like NumberOfHfills, but only those in the manual label!
-int LyXText::NumberOfLabelHfills(Buffer const * buf, Row const * row) const
+int LyXText::numberOfLabelHfills(Buffer const * buf, Row const * row) const
{
- LyXParagraph::size_type last = RowLast(row);
- LyXParagraph::size_type first = row->pos();
+ Paragraph::size_type last = rowLast(row);
+ Paragraph::size_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()));
+ last = min(last, beginningOfMainBody(buf, row->par()));
int n = 0;
- for (LyXParagraph::size_type p = first;
+ for (Paragraph::size_type p = first;
p < last; ++p) { // last, because the end is ignored!
- if (row->par()->IsHfill(p)) {
+ if (row->par()->isHfill(p)) {
++n;
}
}
// returns true, if a expansion is needed.
// Rules are given by LaTeX
-bool LyXText::HfillExpansion(Buffer const * buf, Row const * row_ptr,
- LyXParagraph::size_type pos) const
+bool LyXText::hfillExpansion(Buffer const * buf, Row const * row_ptr,
+ Paragraph::size_type pos) const
{
// by the way, is it a hfill?
- if (!row_ptr->par()->IsHfill(pos))
+ if (!row_ptr->par()->isHfill(pos))
return false;
// at the end of a row it does not count
- if (pos >= RowLast(row_ptr))
+ if (pos >= rowLast(row_ptr))
return false;
// at the beginning of a row it does not count, if it is not
// in some labels it does not count
if (textclasslist.Style(buf->params.textclass,
- row_ptr->par()->GetLayout()).margintype
+ row_ptr->par()->getLayout()).margintype
!= MARGIN_MANUAL
- && pos < BeginningOfMainBody(buf, row_ptr->par()))
+ && pos < beginningOfMainBody(buf, row_ptr->par()))
return false;
// if there is anything between the first char of the row and
// the sepcified position that is not a newline and not a hfill,
// the hfill will count, otherwise not
- LyXParagraph::size_type i = row_ptr->pos();
- while (i < pos && (row_ptr->par()->IsNewline(i)
- || row_ptr->par()->IsHfill(i)))
+ Paragraph::size_type i = row_ptr->pos();
+ while (i < pos && (row_ptr->par()->isNewline(i)
+ || row_ptr->par()->isHfill(i)))
++i;
return i != pos;
}
-void LyXText::SetHeightOfRow(BufferView * bview, Row * row_ptr) const
+LColor::color LyXText::backgroundColor()
{
- /* get the maximum ascent and the maximum descent */
- int asc = 0;
- int desc = 0;
- float layoutasc = 0;
- float layoutdesc = 0;
- float tmptop = 0;
- 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.
- * 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 :) */
-#ifndef NEW_INSETS
- LyXParagraph * par = row_ptr->par()->LastPhysicalPar();
- LyXParagraph * firstpar = row_ptr->par()->FirstPhysicalPar();
-#else
- LyXParagraph * par = row_ptr->par();
- LyXParagraph * firstpar = row_ptr->par();
-#endif
-
- LyXLayout const & layout = textclasslist.Style(bview->buffer()->params.textclass,
- firstpar->GetLayout());
-
-#ifndef NEW_INSETS
- LyXFont font = GetFont(bview->buffer(), par, par->Last() - 1);
-#else
- LyXFont font = GetFont(bview->buffer(), par, par->size() - 1);
-#endif
- LyXFont::FONT_SIZE const size = font.size();
- font = GetFont(bview->buffer(), par, -1);
- font.setSize(size);
-
- LyXFont labelfont = GetFont(bview->buffer(), par, -2);
+ if (inset_owner)
+ return inset_owner->backgroundColor();
+ else
+ return LColor::background;
+}
- 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();
- }
- //lyxerr << "spacing_val = " << spacing_val << endl;
+void LyXText::setHeightOfRow(BufferView * bview, Row * row_ptr) const
+{
+ /* get the maximum ascent and the maximum descent */
+ int asc = 0;
+ int desc = 0;
+ float layoutasc = 0;
+ float layoutdesc = 0;
+ float tmptop = 0;
+ 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.
+ * 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();
- int maxasc = int(lyxfont::maxAscent(font) *
- layout.spacing.getValue() *
- spacing_val);
- int maxdesc = int(lyxfont::maxDescent(font) *
- layout.spacing.getValue() *
- spacing_val);
- int 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) == LyXParagraph::META_INSET) {
- tmpfont = GetFont(bview->buffer(), row_ptr->par(), pos);
- tmpinset = row_ptr->par()->GetInset(pos);
- if (tmpinset) {
-// tmpinset->update(bview, tmpfont);
- asc = tmpinset->ascent(bview, tmpfont);
- desc = tmpinset->descent(bview, tmpfont);
- maxwidth += tmpinset->width(bview, tmpfont);
- maxasc = max(maxasc, asc);
- maxdesc = max(maxdesc, desc);
- }
- } else {
- maxwidth += SingleWidth(bview, row_ptr->par(), pos);
- }
- }
+ LyXLayout const & layout = textclasslist.Style(bview->buffer()->params.textclass,
+ firstpar->getLayout());
+
+ // 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
+ // do the assignment below too often.
+ LyXFont font = getFont(bview->buffer(), par, row_ptr->pos());
+ LyXFont::FONT_SIZE const tmpsize = font.size();
+ font = getLayoutFont(bview->buffer(), par);
+ LyXFont::FONT_SIZE const size = font.size();
+ font.setSize(tmpsize);
+
+ LyXFont labelfont = getLabelFont(bview->buffer(), par);
+
+ float spacing_val = 1.0;
+ if (!row_ptr->par()->params().spacing().isDefault()) {
+ spacing_val = row_ptr->par()->params().spacing().getValue();
+ } else {
+ spacing_val = bview->buffer()->params.spacing.getValue();
+ }
+ //lyxerr << "spacing_val = " << spacing_val << endl;
+
+ int maxasc = int(lyxfont::maxAscent(font) *
+ layout.spacing.getValue() *
+ spacing_val);
+ int maxdesc = int(lyxfont::maxDescent(font) *
+ layout.spacing.getValue() *
+ spacing_val);
+ Paragraph::size_type const pos_end = rowLast(row_ptr);
+ int labeladdon = 0;
+ int maxwidth = 0;
+
+ // Check if any insets are larger
+ for (Paragraph::size_type pos = row_ptr->pos(); pos <= pos_end; ++pos) {
+ if (row_ptr->par()->getChar(pos) == Paragraph::META_INSET) {
+ tmpfont = getFont(bview->buffer(), row_ptr->par(), pos);
+ tmpinset = row_ptr->par()->getInset(pos);
+ if (tmpinset) {
+#if 1 // this is needed for deep update on initialitation
+ tmpinset->update(bview, tmpfont);
+#endif
+ asc = tmpinset->ascent(bview, tmpfont);
+ desc = tmpinset->descent(bview, tmpfont);
+ maxwidth += tmpinset->width(bview, tmpfont);
+ maxasc = max(maxasc, asc);
+ maxdesc = max(maxdesc, desc);
+ }
+ } else {
+ maxwidth += singleWidth(bview, row_ptr->par(), pos);
+ }
+ }
- // Check if any custom fonts are larger (Asger)
- // This is not completely correct, but we can live with the small,
- // cosmetic error for now.
- LyXFont::FONT_SIZE const maxsize =
- row_ptr->par()->HighestFontInRange(row_ptr->pos(),
- pos_end);
- if (maxsize > font.size()) {
- font.setSize(maxsize);
-
- asc = lyxfont::maxAscent(font);
- desc = lyxfont::maxDescent(font);
- if (asc > maxasc)
- maxasc = asc;
- if (desc > maxdesc)
- maxdesc = desc;
- }
+ // Check if any custom fonts are larger (Asger)
+ // This is not completely correct, but we can live with the small,
+ // cosmetic error for now.
+ LyXFont::FONT_SIZE maxsize =
+ row_ptr->par()->highestFontInRange(row_ptr->pos(), pos_end, size);
+ if (maxsize > font.size()) {
+ font.setSize(maxsize);
+
+ asc = lyxfont::maxAscent(font);
+ desc = lyxfont::maxDescent(font);
+ if (asc > maxasc)
+ maxasc = asc;
+ if (desc > maxdesc)
+ maxdesc = desc;
+ }
- // This is nicer with box insets:
- ++maxasc;
- ++maxdesc;
+ // This is nicer with box insets:
+ ++maxasc;
+ ++maxdesc;
- row_ptr->ascent_of_text(maxasc);
+ row_ptr->ascent_of_text(maxasc);
- // is it a top line?
- if (!row_ptr->pos() && (row_ptr->par() == firstpar)) {
+ // 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) {
- if (layout.isParagraph()
- && firstpar->GetDepth() == 0
- && firstpar->previous())
- 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)
- // is it right to use defskip here too? (AS)
- maxasc += bview->buffer()->params.getDefSkip().inPixels(bview);
- }
+ // some parksips VERY EASY IMPLEMENTATION
+ if (bview->buffer()->params.paragraph_separation ==
+ BufferParams::PARSEP_SKIP)
+ {
+ if (layout.isParagraph()
+ && firstpar->getDepth() == 0
+ && firstpar->previous())
+ {
+ 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)
+ {
+ // is it right to use defskip here too? (AS)
+ maxasc += bview->buffer()->params.getDefSkip().inPixels(bview);
+ }
+ }
- // the paper margins
-#ifndef NEW_INSETS
- if (!row_ptr->par()->previous_ && bv_owner)
- maxasc += LYX_PAPER_MARGIN;
-#else
- if (!row_ptr->par()->previous() && bv_owner)
- maxasc += LYX_PAPER_MARGIN;
-#endif
+ // 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));
+ // add the vertical spaces, that the user added
+ if (firstpar->params().spaceTop().kind() != VSpace::NONE)
+ maxasc += int(firstpar->params().spaceTop().inPixels(bview));
- // 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));
+ // 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));
- // and now the pagebreaks
- if (firstpar->params.pagebreakTop())
- maxasc += 3 * DefaultHeight();
+ // 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
- && bview->buffer()->params.secnumdepth >= 0) {
- float spacing_val = 1.0;
- if (!row_ptr->par()->params.spacing().isDefault()) {
- spacing_val = row_ptr->par()->params.spacing().getValue();
- } else {
- spacing_val = bview->buffer()->params.spacing.getValue();
- }
+ // 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
+ && bview->buffer()->params.secnumdepth >= 0)
+ {
+ float spacing_val = 1.0;
+ if (!row_ptr->par()->params().spacing().isDefault()) {
+ spacing_val = row_ptr->par()->params().spacing().getValue();
+ } else {
+ spacing_val = bview->buffer()->params.spacing.getValue();
+ }
- labeladdon = int(lyxfont::maxDescent(labelfont) *
- layout.spacing.getValue() *
- spacing_val)
- + int(lyxfont::maxAscent(labelfont) *
- layout.spacing.getValue() *
- spacing_val);
- }
+ labeladdon = int(lyxfont::maxDescent(labelfont) *
+ 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
- || layout.labeltype == LABEL_CENTERED_TOP_ENVIRONMENT)
- && row_ptr->par()->IsFirstInSequence()
- && !row_ptr->par()->GetLabelstring().empty()) {
- 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();
- }
+ // special code for the top label
+ if ((layout.labeltype == LABEL_TOP_ENVIRONMENT
+ || layout.labeltype == LABEL_BIBLIO
+ || layout.labeltype == LABEL_CENTERED_TOP_ENVIRONMENT)
+ && row_ptr->par()->isFirstInSequence()
+ && !row_ptr->par()->getLabelstring().empty())
+ {
+ 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();
+ }
- labeladdon = int(
- (lyxfont::maxAscent(labelfont) *
- layout.spacing.getValue() *
- spacing_val)
- +(lyxfont::maxDescent(labelfont) *
- layout.spacing.getValue() *
- spacing_val)
- + layout.topsep * DefaultHeight()
- + layout.labelbottomsep * DefaultHeight());
- }
+ labeladdon = int(
+ (lyxfont::maxAscent(labelfont) *
+ layout.spacing.getValue() *
+ spacing_val)
+ +(lyxfont::maxDescent(labelfont) *
+ layout.spacing.getValue() *
+ spacing_val)
+ + layout.topsep * defaultHeight()
+ + layout.labelbottomsep * defaultHeight());
+ }
- // and now the layout spaces, for example before and after a section,
- // or between the items of a itemize or enumerate environment
+ // 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()) {
- LyXParagraph * prev = row_ptr->par()->previous();
- if (prev)
- prev = row_ptr->par()->DepthHook(row_ptr->par()->GetDepth());
- if (prev && prev->GetLayout() == firstpar->GetLayout()
- && prev->GetDepth() == firstpar->GetDepth()
- && prev->GetLabelWidthString() == firstpar->GetLabelWidthString())
- {
- layoutasc = (layout.itemsep * DefaultHeight());
- }
- else if (row_ptr->previous()) {
- tmptop = layout.topsep;
+ 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() &&
+ 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;
+ if (row_ptr->previous()->par()->getDepth() >= row_ptr->par()->getDepth())
+ tmptop -= textclasslist.Style(bview->buffer()->params.textclass,
+ row_ptr->previous()->par()->
+ getLayout()).bottomsep;
- if (tmptop > 0)
- layoutasc = (tmptop * DefaultHeight());
- }
- else if (row_ptr->par()->params.lineTop()) {
- tmptop = layout.topsep;
+ if (tmptop > 0)
+ layoutasc = (tmptop * defaultHeight());
+ } else if (row_ptr->par()->params().lineTop()) {
+ tmptop = layout.topsep;
- if (tmptop > 0)
- layoutasc = (tmptop * DefaultHeight());
- }
+ if (tmptop > 0)
+ layoutasc = (tmptop * defaultHeight());
+ }
- prev = row_ptr->par()->DepthHook(row_ptr->par()->GetDepth()-1);
- if (prev) {
- maxasc += int(textclasslist.Style(bview->buffer()->params.textclass,
- prev->GetLayout()).parsep * DefaultHeight());
- }
- else {
- if (firstpar->previous()
- && firstpar->previous()->GetDepth() == 0
- && firstpar->previous()->GetLayout() != firstpar->GetLayout()) {
- // avoid parsep
+ prev = row_ptr->par()->outerHook();
+ if (prev) {
+ maxasc += int(textclasslist.Style(bview->buffer()->params.textclass,
+ prev->getLayout()).parsep * defaultHeight());
+ } else {
+ if (firstpar->previous() &&
+ firstpar->previous()->getDepth() == 0 &&
+ firstpar->previous()->getLayout() !=
+ firstpar->getLayout())
+ {
+ // avoid parsep
+ } else if (firstpar->previous()) {
+ maxasc += int(layout.parsep * defaultHeight());
+ }
+ }
}
- else if (firstpar->previous()){
- maxasc += int(layout.parsep * DefaultHeight());
- }
- }
- }
- }
+ }
- // is it a bottom line?
- if (
-#ifndef NEW_INSETS
- row_ptr->par()->ParFromPos(RowLast(row_ptr) + 1) == par
-#else
- row_ptr->par() == par
-#endif
- && (!row_ptr->next() || row_ptr->next()->par() != row_ptr->par())) {
-
- // the paper margins
-#ifndef NEW_INSETS
- if (!par->next_ && bv_owner)
- maxdesc += LYX_PAPER_MARGIN;
-#else
- if (!par->next() && bv_owner)
- maxdesc += LYX_PAPER_MARGIN;
-#endif
+ // is it a bottom line?
+ if (row_ptr->par() == par
+ && (!row_ptr->next() || row_ptr->next()->par() != row_ptr->par()))
+ {
+ // the paper margins
+ if (!par->next() && bv_owner)
+ maxdesc += LYX_PAPER_MARGIN;
- // add the vertical spaces, that the user added
- if (firstpar->params.spaceBottom().kind() != VSpace::NONE)
- maxdesc += int(firstpar->params.spaceBottom().inPixels(bview));
+ // add the vertical spaces, that the user added
+ if (firstpar->params().spaceBottom().kind() != VSpace::NONE)
+ maxdesc += int(firstpar->params().spaceBottom().inPixels(bview));
- // do not forget the DTP-lines!
- // there height depends on the font of the nearest character
-#ifndef NEW_INSETS
- if (firstpar->params.lineBottom())
- maxdesc += 2 * lyxfont::ascent('x', GetFont(bview->buffer(),
- par, par->Last() - 1));
-#else
- if (firstpar->params.lineBottom())
- maxdesc += 2 * lyxfont::ascent('x',
- GetFont(bview->buffer(),
- par, par->size() - 1));
-#endif
+ // 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,
+ max(Paragraph::size_type(0), par->size() - 1)));
- // and now the pagebreaks
- if (firstpar->params.pagebreakBottom())
- maxdesc += 3 * DefaultHeight();
+ // 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()) {
- LyXParagraph * nextpar = row_ptr->par()->next();
- LyXParagraph * comparepar = row_ptr->par();
- float usual = 0;
- float unusual = 0;
+ // and now the layout spaces, for example before and after
+ // a section, or between the items of a itemize or enumerate
+ // environment
+ if (!firstpar->params().pagebreakBottom() && row_ptr->par()->next()) {
+ Paragraph * nextpar = row_ptr->par()->next();
+ Paragraph * comparepar = row_ptr->par();
+ float usual = 0;
+ float unusual = 0;
- if (comparepar->GetDepth() > nextpar->GetDepth()) {
- usual = (textclasslist.Style(bview->buffer()->params.textclass, comparepar->GetLayout()).bottomsep * DefaultHeight());
- comparepar = comparepar->DepthHook(nextpar->GetDepth());
- if (comparepar->GetLayout()!= nextpar->GetLayout()
- || nextpar->GetLabelWidthString() !=
- comparepar->GetLabelWidthString())
- unusual = (textclasslist.Style(bview->buffer()->params.textclass, comparepar->GetLayout()).bottomsep * DefaultHeight());
-
- if (unusual > usual)
- layoutdesc = unusual;
- else
- layoutdesc = usual;
- }
- else if (comparepar->GetDepth() == nextpar->GetDepth()) {
-
- if (comparepar->GetLayout()!= nextpar->GetLayout()
- || nextpar->GetLabelWidthString() !=
- comparepar->GetLabelWidthString())
- layoutdesc = int(textclasslist.Style(bview->buffer()->params.textclass, comparepar->GetLayout()).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, dummy;
- 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) {
- if (r->width() > width)
- width = r->width();
- r = r->next();
- }
- }
+ if (comparepar->getDepth() > nextpar->getDepth()) {
+ usual = (textclasslist.Style(bview->buffer()->params.textclass,
+ comparepar->getLayout()).bottomsep * defaultHeight());
+ comparepar = comparepar->depthHook(nextpar->getDepth());
+ if (comparepar->getLayout()!= nextpar->getLayout()
+ || nextpar->getLabelWidthString() !=
+ comparepar->getLabelWidthString())
+ {
+ unusual = (textclasslist.Style(bview->buffer()->params.textclass,
+ comparepar->getLayout()).bottomsep * defaultHeight());
+ }
+ if (unusual > usual)
+ layoutdesc = unusual;
+ else
+ layoutdesc = usual;
+ } else if (comparepar->getDepth() == nextpar->getDepth()) {
+
+ if (comparepar->getLayout()!= nextpar->getLayout()
+ || nextpar->getLabelWidthString() !=
+ comparepar->getLabelWidthString())
+ layoutdesc = int(textclasslist.Style(bview->buffer()->params.textclass,
+ comparepar->getLayout()).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 = 0;
+ if (layout.margintype != MARGIN_RIGHT_ADDRESS_BOX) {
+ float dummy;
+ 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) {
+ if (r->width() > width)
+ width = r->width();
+ r = r->next();
+ }
+ }
}
/* Appends the implicit specified paragraph behind the specified row,
* start at the implicit given position */
-void LyXText::AppendParagraph(BufferView * bview, Row * row) const
+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)
-#ifndef NEW_INSETS
- int const lastposition = row->par()->Last();
-#else
- int const lastposition = row->par()->size();
-#endif
+ Paragraph::size_type const lastposition = row->par()->size();
do {
// Get the next breakpoint
- int z = NextBreakPoint(bview, row, workWidth(bview));
+ Paragraph::size_type z = nextBreakPoint(bview, row, workWidth(bview));
Row * tmprow = row;
// Insert the new row
if (z < lastposition) {
++z;
- InsertRow(row, row->par(), z);
+ insertRow(row, row->par(), z);
row = row->next();
row->height(0);
not_ready = false;
// Set the dimensions of the row
- tmprow->fill(Fill(bview, tmprow, workWidth(bview)));
- SetHeightOfRow(bview, tmprow);
+#ifdef WITH_WARNINGS
+#warning Something is rotten here! (Jug)
+#endif
+ tmprow->fill(fill(bview, tmprow, workWidth(bview)));
+ setHeightOfRow(bview, tmprow);
} while (not_ready);
}
-void LyXText::BreakAgain(BufferView * bview, Row * row) const
+void LyXText::breakAgain(BufferView * bview, Row * row) const
{
- bool not_ready = true;
+ bool not_ready = true;
- do {
- // get the next breakpoint
- LyXParagraph::size_type z = NextBreakPoint(bview, row, workWidth(bview));
- Row * tmprow = row;
+ do {
+ // get the next breakpoint
+ Paragraph::size_type z = nextBreakPoint(bview, row, workWidth(bview));
+ Row * tmprow = row;
-#ifndef NEW_INSETS
- if (z < row->par()->Last()) {
-#else
- if (z < row->par()->size()) {
-#endif
- if (!row->next() || (row->next() && row->next()->par() != row->par())) {
- // insert a new row
- ++z;
- InsertRow(row, row->par(), z);
- row = row->next();
- row->height(0);
- } else {
- row = row->next();
- ++z;
- if (row->pos() == z)
- not_ready = false; // the rest will not change
- else {
- row->pos(z);
- }
- }
- } else {
- /* if there are some rows too much, delete them */
- /* only if you broke the whole paragraph! */
- Row * tmprow2 = row;
- while (tmprow2->next() && tmprow2->next()->par() == row->par()) {
- tmprow2 = tmprow2->next();
- }
- while (tmprow2 != row) {
- tmprow2 = tmprow2->previous();
- RemoveRow(tmprow2->next());
- }
- not_ready = false;
- }
-
- /* set the dimensions of the row */
- tmprow->fill(Fill(bview, tmprow, workWidth(bview)));
- SetHeightOfRow(bview, tmprow);
- } while (not_ready);
+ if (z < row->par()->size()) {
+ if (!row->next() || (row->next() && row->next()->par() != row->par())) {
+ // insert a new row
+ ++z;
+ insertRow(row, row->par(), z);
+ row = row->next();
+ row->height(0);
+ } else {
+ row = row->next();
+ ++z;
+ if (row->pos() == z)
+ not_ready = false; // the rest will not change
+ else {
+ row->pos(z);
+ }
+ }
+ } else {
+ /* if there are some rows too much, delete them */
+ /* only if you broke the whole paragraph! */
+ Row * tmprow2 = row;
+ while (tmprow2->next() && tmprow2->next()->par() == row->par()) {
+ tmprow2 = tmprow2->next();
+ }
+ while (tmprow2 != row) {
+ tmprow2 = tmprow2->previous();
+ removeRow(tmprow2->next());
+ }
+ not_ready = false;
+ }
+
+ /* set the dimensions of the row */
+ tmprow->fill(fill(bview, tmprow, workWidth(bview)));
+ setHeightOfRow(bview, tmprow);
+ } while (not_ready);
}
// this is just a little changed version of break again
-void LyXText::BreakAgainOneRow(BufferView * bview, Row * row)
+void LyXText::breakAgainOneRow(BufferView * bview, Row * row)
{
// get the next breakpoint
- LyXParagraph::size_type z = NextBreakPoint(bview, row, workWidth(bview));
+ Paragraph::size_type z = nextBreakPoint(bview, row, workWidth(bview));
Row * tmprow = row;
-#ifndef NEW_INSETS
- if (z < row->par()->Last()) {
-#else
if (z < row->par()->size()) {
-#endif
if (!row->next()
|| (row->next() && row->next()->par() != row->par())) {
/* insert a new row */
++z;
- InsertRow(row, row->par(), z);
+ insertRow(row, row->par(), z);
row = row->next();
row->height(0);
} else {
}
while (tmprow2 != row) {
tmprow2 = tmprow2->previous();
- RemoveRow(tmprow2->next());
+ removeRow(tmprow2->next());
}
}
// set the dimensions of the row
- tmprow->fill(Fill(bview, tmprow, workWidth(bview)));
- SetHeightOfRow(bview, tmprow);
+ tmprow->fill(fill(bview, tmprow, workWidth(bview)));
+ setHeightOfRow(bview, tmprow);
}
-void LyXText::BreakParagraph(BufferView * bview, char keep_layout)
+void LyXText::breakParagraph(BufferView * bview, char keep_layout)
{
LyXLayout const & layout =
textclasslist.Style(bview->buffer()->params.textclass,
- cursor.par()->GetLayout());
+ cursor.par()->getLayout());
// this is only allowed, if the current paragraph is not empty or caption
-#ifndef NEW_INSETS
- if ((cursor.par()->Last() <= 0
- && !cursor.par()->IsDummy())
- && layout.labeltype!= LABEL_SENSITIVE)
- return;
-
- SetUndo(bview->buffer(), Undo::INSERT,
- cursor.par()->ParFromPos(cursor.pos())->previous_,
- cursor.par()->ParFromPos(cursor.pos())->next_);
-#else
if ((cursor.par()->size() <= 0)
&& layout.labeltype!= LABEL_SENSITIVE)
return;
- SetUndo(bview->buffer(), Undo::INSERT,
- cursor.par()->previous(),
- cursor.par()->next());
-#endif
+ setUndo(bview, Undo::INSERT,cursor.par(),cursor.par()->next());
// Always break behind a space
//
// It is better to erase the space (Dekel)
-#ifndef NEW_INSETS
- if (cursor.pos() < cursor.par()->Last()
-#else
if (cursor.pos() < cursor.par()->size()
-#endif
- && cursor.par()->IsLineSeparator(cursor.pos()))
- cursor.par()->Erase(cursor.pos());
+ && cursor.par()->isLineSeparator(cursor.pos()))
+ cursor.par()->erase(cursor.pos());
// cursor.pos(cursor.pos() + 1);
// break the paragraph
keep_layout = 2;
else
keep_layout = layout.isEnvironment();
- cursor.par()->BreakParagraph(bview->buffer()->params, cursor.pos(),
+ cursor.par()->breakParagraph(bview->buffer()->params, cursor.pos(),
keep_layout);
// well this is the caption hack since one caption is really enough
if (layout.labeltype == LABEL_SENSITIVE) {
if (!cursor.pos())
// set to standard-layout
-#ifndef NEW_INSETS
- cursor.par()->SetLayout(bview->buffer()->params, 0);
-#else
- cursor.par()->SetLayout(0);
-#endif
+ cursor.par()->setLayout(0);
else
// set to standard-layout
-#ifndef NEW_INSETS
- cursor.par()->next()->SetLayout(bview->buffer()->params, 0);
-#else
- cursor.par()->next()->SetLayout(0);
-#endif
+ cursor.par()->next()->setLayout(0);
}
/* 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)
+ if (cursor.pos() && !cursor.row()->par()->isNewline(cursor.row()->pos() - 1)
&& cursor.row()->pos() == cursor.pos()) {
- CursorLeft(bview);
+ cursorLeft(bview);
}
- status = LyXText::NEED_MORE_REFRESH;
+ status(bview, LyXText::NEED_MORE_REFRESH);
refresh_row = cursor.row();
refresh_y = cursor.y() - cursor.row()->baseline();
refresh_y -= refresh_row->height();
}
}
- RemoveParagraph(cursor.row());
+ removeParagraph(cursor.row());
// set the dimensions of the cursor row
- cursor.row()->fill(Fill(bview, cursor.row(), workWidth(bview)));
+ cursor.row()->fill(fill(bview, cursor.row(), workWidth(bview)));
- SetHeightOfRow(bview, cursor.row());
+ setHeightOfRow(bview, cursor.row());
-#ifndef NEW_INSETS
- while (cursor.par()->next()->Last()
-#else
while (cursor.par()->next()->size()
-#endif
- && cursor.par()->next()->IsNewline(0))
- cursor.par()->next()->Erase(0);
+ && cursor.par()->next()->isNewline(0))
+ cursor.par()->next()->erase(0);
- InsertParagraph(bview, cursor.par()->next(), cursor.row());
+ insertParagraph(bview, cursor.par()->next(), cursor.row());
- UpdateCounters(bview, cursor.row()->previous());
+ 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! */
if (cursor.pos())
- SetCursor(bview, cursor.par()->next(), 0);
+ setCursor(bview, cursor.par()->next(), 0);
else
- SetCursor(bview, cursor.par(), 0);
+ setCursor(bview, cursor.par(), 0);
if (cursor.row()->next())
- BreakAgain(bview, cursor.row()->next());
+ breakAgain(bview, cursor.row()->next());
need_break_row = 0;
}
-#ifndef NEW_INSETS
-void LyXText::OpenFootnote(BufferView * bview)
-{
- LyXParagraph * endpar,* tmppar;
- Row * row;
-
- LyXParagraph * par = cursor.par()->ParFromPos(cursor.pos());
-
- /* if there is no footnote in this paragraph, just return. */
- if (!par->next_
- || par->next_->footnoteflag != LyXParagraph::CLOSED_FOOTNOTE)
- return;
-
- /* ok, move the cursor right before the footnote */
-
- /* just a little faster than using CursorRight() */
- for (cursor.pos(0);
- cursor.par()->ParFromPos(cursor.pos()) != par;) {
- cursor.pos(cursor.pos() + 1);
- }
-
- /* now the cursor is at the beginning of the physical par */
- SetCursor(bview, cursor.par(),
- cursor.pos() + cursor.par()->ParFromPos(cursor.pos())->size());
-
- /* the cursor must be exactly before the footnote */
- par = cursor.par()->ParFromPos(cursor.pos());
-
- status = LyXText::NEED_MORE_REFRESH;
- refresh_row = cursor.row();
- refresh_y = cursor.y() - cursor.row()->baseline();
-
- tmppar = cursor.par();
- endpar = cursor.par()->next();
- row = cursor.row();
-
- tmppar->OpenFootnote(cursor.pos());
- RemoveParagraph(row);
- /* set the dimensions of the cursor row */
- row->fill(Fill(bview, row, workWidth(bview)));
- SetHeightOfRow(bview, row);
- // CHECK See comment on top of text.C
- tmppar = tmppar->next();
-
- while (tmppar != endpar) {
- if (tmppar) {
- InsertParagraph(bview, tmppar, row);
- while (row->next() && row->next()->par() == tmppar)
- row = row->next();
- tmppar = tmppar->next();
- }
- }
- SetCursor(bview, par->next_, 0);
- sel_cursor = cursor;
-}
-#endif
-
-
// Just a macro to make some thing easier.
-void LyXText::RedoParagraph(BufferView * bview) const
+void LyXText::redoParagraph(BufferView * bview) const
{
- ClearSelection(bview);
- RedoParagraphs(bview, cursor, cursor.par()->next());
- SetCursorIntern(bview, cursor.par(), cursor.pos());
+ clearSelection();
+ redoParagraphs(bview, cursor, cursor.par()->next());
+ setCursorIntern(bview, cursor.par(), cursor.pos());
}
/* 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)
+void LyXText::insertChar(BufferView * bview, char c)
{
- SetUndo(bview->buffer(), Undo::INSERT,
-#ifndef NEW_INSETS
- cursor.par()->ParFromPos(cursor.pos())->previous_,
- cursor.par()->ParFromPos(cursor.pos())->next_
-#else
- cursor.par()->previous(),
- cursor.par()->next()
-#endif
- );
+ 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;
+ cursor.row()->par()->getLayout()).free_spacing;
if (lyxrc.auto_number) {
!(contains(number_seperators, c) &&
cursor.pos() >= 1 &&
cursor.pos() < cursor.par()->size() &&
- GetFont(bview->buffer(),
+ getFont(bview->buffer(),
cursor.par(),
cursor.pos()).number() == LyXFont::ON &&
- GetFont(bview->buffer(),
+ getFont(bview->buffer(),
cursor.par(),
- cursor.pos()-1).number() == LyXFont::ON)
+ cursor.pos() - 1).number() == LyXFont::ON)
)
- Number(bview); // Set current_font.number to OFF
+ number(bview); // Set current_font.number to OFF
} else if (isdigit(c) &&
real_current_font.isVisibleRightToLeft()) {
- Number(bview); // Set current_font.number to ON
+ number(bview); // Set current_font.number to ON
if (cursor.pos() > 0) {
- char const c = cursor.par()->GetChar(cursor.pos() - 1);
+ char const c = cursor.par()->getChar(cursor.pos() - 1);
if (contains(number_unary_operators, c) &&
(cursor.pos() == 1 ||
- cursor.par()->IsSeparator(cursor.pos() - 2) ||
- cursor.par()->IsNewline(cursor.pos() - 2) )
+ cursor.par()->isSeparator(cursor.pos() - 2) ||
+ cursor.par()->isNewline(cursor.pos() - 2) )
) {
- SetCharFont(bview->buffer(),
+ setCharFont(bview->buffer(),
cursor.par(),
cursor.pos() - 1,
current_font);
} else if (contains(number_seperators, c) &&
cursor.pos() >= 2 &&
- GetFont(bview->buffer(),
+ getFont(bview->buffer(),
cursor.par(),
- cursor.pos()-2).number() == LyXFont::ON) {
- SetCharFont(bview->buffer(),
+ cursor.pos() - 2).number() == LyXFont::ON) {
+ setCharFont(bview->buffer(),
cursor.par(),
cursor.pos() - 1,
current_font);
* current font */
// Get the font that is used to calculate the baselineskip
-#ifndef NEW_INSETS
- LyXParagraph::size_type const lastpos = cursor.par()->Last();
-#else
- LyXParagraph::size_type const lastpos = cursor.par()->size();
-#endif
- LyXFont rawparfont = cursor.par()->GetFontSettings(bview->buffer()->params,
- lastpos - 1);
+ Paragraph::size_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
- && cursor.par()->IsLineSeparator(cursor.pos() - 1))
+ && cursor.par()->isLineSeparator(cursor.pos() - 1))
|| (cursor.pos() > 0
- && cursor.par()->IsNewline(cursor.pos() - 1))
- || (cursor.pos() == 0
-#ifndef NEW_INSETS
- && !(cursor.par()->previous()
- && cursor.par()->previous()->footnoteflag
- == LyXParagraph::OPEN_FOOTNOTE)
-#endif
- )) {
- if (cursor.pos() == 0 )
- bview->owner()->getMiniBuffer()->Set(_("You cannot insert a space at the beginning of a paragraph. Please read the Tutorial."));
- else
- bview->owner()->getMiniBuffer()->Set(_("You cannot type two spaces this way. Please read the Tutorial."));
+ && cursor.par()->isNewline(cursor.pos() - 1))
+ || (cursor.pos() == 0)) {
+ static bool sent_space_message = false;
+ if (!sent_space_message) {
+ if (cursor.pos() == 0)
+ bview->owner()->message(_("You cannot insert a space at the beginning of a paragraph. Please read the Tutorial."));
+ else
+ bview->owner()->message(_("You cannot type two spaces this way. Please read the Tutorial."));
+ sent_space_message = true;
+ }
charInserted();
return;
}
} else if (IsNewlineChar(c)) {
-#ifndef NEW_INSETS
- if (cursor.par()->FirstPhysicalPar() == cursor.par()
-#else
if (cursor.par() == cursor.par()
-#endif
- && cursor.pos() <= BeginningOfMainBody(bview->buffer(), cursor.par())) {
+ && cursor.pos() <= beginningOfMainBody(bview->buffer(), cursor.par())) {
charInserted();
return;
}
* of a paragraph or behind labels.
* TeX does not allow that. */
-#ifndef NEW_INSETS
- if (cursor.pos() < cursor.par()->Last() &&
-#else
if (cursor.pos() < cursor.par()->size() &&
-#endif
- cursor.par()->IsLineSeparator(cursor.pos()))
+ cursor.par()->isLineSeparator(cursor.pos()))
// newline always after a blank!
- CursorRight(bview);
+ cursorRight(bview);
cursor.row()->fill(-1); // to force a new break
}
// the display inset stuff
- if (cursor.row()->par()->GetChar(cursor.row()->pos()) == LyXParagraph::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()))
+ 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
// get the cursor row fist
Row * row = cursor.row();
int y = cursor.y() - row->baseline();
- if (c != LyXParagraph::META_INSET) /* Here case LyXText::InsertInset
+ 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);
+ cursor.par()->insertChar(cursor.pos(), c);
+ setCharFont(bview->buffer(), cursor.par(), cursor.pos(), rawtmpfont);
if (!jumped_over_space) {
// refresh the positions
}
// Is there a break one row above
- if ((cursor.par()->IsLineSeparator(cursor.pos())
- || cursor.par()->IsNewline(cursor.pos())
+ if ((cursor.par()->isLineSeparator(cursor.pos())
+ || cursor.par()->isNewline(cursor.pos())
|| cursor.row()->fill() == -1)
&& row->previous() && row->previous()->par() == row->par()) {
- LyXParagraph::size_type z = NextBreakPoint(bview,
+ Paragraph::size_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()->fill(fill(bview,
row->previous(),
workWidth(bview)));
- SetHeightOfRow(bview, row->previous());
+ setHeightOfRow(bview, row->previous());
y -= row->previous()->height();
refresh_y = y;
refresh_row = row->previous();
- status = LyXText::NEED_MORE_REFRESH;
+ status(bview, LyXText::NEED_MORE_REFRESH);
- BreakAgainOneRow(bview, row);
+ breakAgainOneRow(bview, row);
current_font = rawtmpfont;
real_current_font = realtmpfont;
- SetCursor(bview, cursor.par(), cursor.pos() + 1,
+ setCursor(bview, cursor.par(), cursor.pos() + 1,
false, cursor.boundary());
// cursor MUST be in row now.
need_break_row = 0;
// check, wether the last characters font has changed.
-#ifndef NEW_INSETS
- if (cursor.pos() && cursor.pos() == cursor.par()->Last()
-#else
if (cursor.pos() && cursor.pos() == cursor.par()->size()
-#endif
&& rawparfont != rawtmpfont)
- RedoHeightOfParagraph(bview, cursor);
+ redoHeightOfParagraph(bview, cursor);
charInserted();
return;
if (row->fill() >= 0) /* needed because a newline
* will set fill to -1. Otherwise
* we would not get a rebreak! */
- row->fill(Fill(bview, row, workWidth(bview)));
+ row->fill(fill(bview, row, workWidth(bview)));
if (row->fill() < 0) {
refresh_y = y;
refresh_row = row;
refresh_x = cursor.x();
refresh_pos = cursor.pos();
- status = LyXText::NEED_MORE_REFRESH;
- BreakAgainOneRow(bview, row);
+ status(bview, LyXText::NEED_MORE_REFRESH);
+ breakAgainOneRow(bview, row);
// will the cursor be in another row now?
- if (RowLast(row) <= cursor.pos() + 1 && row->next()) {
+ if (rowLast(row) <= cursor.pos() + 1 && row->next()) {
if (row->next() && row->next()->par() == row->par())
// this should always be true
row = row->next();
- BreakAgainOneRow(bview, row);
+ breakAgainOneRow(bview, row);
}
current_font = rawtmpfont;
real_current_font = realtmpfont;
- SetCursor(bview, cursor.par(), cursor.pos() + 1, false,
+ setCursor(bview, cursor.par(), cursor.pos() + 1, false,
cursor.boundary());
- if (IsBoundary(bview->buffer(), cursor.par(), cursor.pos())
+ if (isBoundary(bview->buffer(), cursor.par(), cursor.pos())
!= cursor.boundary())
- SetCursor(bview, cursor.par(), cursor.pos(), false,
+ setCursor(bview, cursor.par(), cursor.pos(), false,
!cursor.boundary());
if (row->next() && row->next()->par() == row->par())
need_break_row = row->next();
refresh_pos = cursor.pos();
int const tmpheight = row->height();
- SetHeightOfRow(bview, row);
+ setHeightOfRow(bview, row);
if (tmpheight == row->height())
- status = LyXText::NEED_VERY_LITTLE_REFRESH;
+ status(bview, LyXText::NEED_VERY_LITTLE_REFRESH);
else
- status = LyXText::NEED_MORE_REFRESH;
+ status(bview, LyXText::NEED_MORE_REFRESH);
current_font = rawtmpfont;
real_current_font = realtmpfont;
- SetCursor(bview, cursor.par(), cursor.pos() + 1, false,
+ setCursor(bview, cursor.par(), cursor.pos() + 1, false,
cursor.boundary());
}
// check, wether the last characters font has changed.
-#ifndef NEW_INSETS
- if (cursor.pos() && cursor.pos() == cursor.par()->Last()
-#else
if (cursor.pos() && cursor.pos() == cursor.par()->size()
-#endif
&& rawparfont != rawtmpfont) {
- RedoHeightOfParagraph(bview, cursor);
+ redoHeightOfParagraph(bview, cursor);
} else {
// now the special right address boxes
if (textclasslist.Style(bview->buffer()->params.textclass,
- cursor.par()->GetLayout()).margintype
+ cursor.par()->getLayout()).margintype
== MARGIN_RIGHT_ADDRESS_BOX) {
- RedoDrawingOfParagraph(bview, cursor);
+ redoDrawingOfParagraph(bview, cursor);
}
}
{
// Here we could call FinishUndo for every 20 characters inserted.
// This is from my experience how emacs does it.
- static unsigned int counter = 0;
+ static unsigned int counter;
if (counter < 20) {
++counter;
} else {
- FinishUndo();
+ finishUndo();
counter = 0;
}
}
-void LyXText::PrepareToPrint(BufferView * bview,
- Row * row, float & x,
- float & fill_separator,
- float & fill_hfill,
- float & fill_label_hfill,
- bool bidi) const
+void LyXText::prepareToPrint(BufferView * bview,
+ Row * row, float & x,
+ float & fill_separator,
+ float & fill_hfill,
+ float & fill_label_hfill,
+ bool bidi) const
{
- float nlh, ns;
+ float nlh;
+ float ns;
float w = row->fill();
fill_hfill = 0;
row->par()->isRightToLeftPar(bview->buffer()->params);
if (is_rtl) {
x = (workWidth(bview) > 0)
- ? RightMargin(bview->buffer(), row) : 0;
-#ifndef NEW_INSETS
- if (row->par()->footnoteflag == LyXParagraph::OPEN_FOOTNOTE) {
- LyXFont font(LyXFont::ALL_SANE);
- font.setSize(LyXFont::SIZE_SMALL);
- x += lyxfont::width("Mwide-figM", font);
- }
-#endif
+ ? rightMargin(bview->buffer(), row) : 0;
} else
- x = (workWidth(bview) > 0) ? LeftMargin(bview, row) : 0;
+ 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
+ row->par()->getLayout()).margintype == MARGIN_MANUAL
&& textclasslist.Style(bview->buffer()->params.textclass,
- row->par()->GetLayout()).labeltype == LABEL_MANUAL) {
+ row->par()->getLayout()).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;
+ 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);
+ float const nh = numberOfHfills(bview->buffer(), row);
- if (nh)
- fill_hfill = w / nh;
- else {
+ if (nh) {
+ if (w > 0)
+ fill_hfill = w / nh;
+ } else {
// is it block, flushleft or flushright?
// set x how you need it
- int align;
-#ifndef NEW_INSETS
- if (row->par()->FirstPhysicalPar()->params.align() == LYX_ALIGN_LAYOUT)
- align = textclasslist.Style(bview->buffer()->params.textclass, row->par()->GetLayout()).align;
- else
- align = row->par()->FirstPhysicalPar()->params.align();
-#else
- if (row->par()->params.align() == LYX_ALIGN_LAYOUT)
- align = textclasslist.Style(bview->buffer()->params.textclass, row->par()->GetLayout()).align;
- else
- align = row->par()->params.align();
-#endif
-
- // center displayed insets
- Inset * inset;
- if (row->par()->GetChar(row->pos()) == LyXParagraph::META_INSET
- && (inset=row->par()->GetInset(row->pos()))
- && (inset->display())) // || (inset->scroll() < 0)))
- align = (inset->LyxCode() == Inset::MATHMACRO_CODE)
- ? LYX_ALIGN_BLOCK : LYX_ALIGN_CENTER;
-
- switch (align) {
+ int align;
+ if (row->par()->params().align() == LYX_ALIGN_LAYOUT) {
+ align = textclasslist.Style(bview->buffer()->params.textclass, row->par()->getLayout()).align;
+ } else {
+ align = row->par()->params().align();
+ }
+
+ // center displayed insets
+ Inset * inset;
+ if (row->par()->getChar(row->pos()) == Paragraph::META_INSET
+ && (inset=row->par()->getInset(row->pos()))
+ && (inset->display())) // || (inset->scroll() < 0)))
+ align = (inset->lyxCode() == Inset::MATHMACRO_CODE)
+ ? LYX_ALIGN_BLOCK : LYX_ALIGN_CENTER;
+
+ 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()) == LyXParagraph::META_INSET
- && row->next()->par()->GetInset(row->next()->pos())
- && row->next()->par()->GetInset(row->next()->pos())->display())
- )
- fill_separator = w / ns;
- else if (is_rtl)
- x += w;
- break;
+ 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())
+ )
+ {
+ fill_separator = w / ns;
+ } else if (is_rtl) {
+ x += w;
+ }
+ break;
case LYX_ALIGN_RIGHT:
- x += w;
- break;
+ x += w;
+ break;
case LYX_ALIGN_CENTER:
- x += w / 2;
- break;
- }
+ x += w / 2;
+ break;
+ }
}
if (!bidi)
return;
- ComputeBidiTables(bview->buffer(), row);
+ computeBidiTables(bview->buffer(), row);
if (is_rtl) {
- LyXParagraph::size_type main_body =
- BeginningOfMainBody(bview->buffer(), row->par());
- LyXParagraph::size_type last = RowLast(row);
+ Paragraph::size_type main_body =
+ beginningOfMainBody(bview->buffer(), row->par());
+ Paragraph::size_type last = rowLast(row);
if (main_body > 0 &&
(main_body-1 > last ||
- !row->par()->IsLineSeparator(main_body-1))) {
+ !row->par()->isLineSeparator(main_body-1))) {
LyXLayout const & layout =
textclasslist.Style(bview->buffer()->params.textclass,
- row->par()->GetLayout());
+ row->par()->getLayout());
x += lyxfont::width(layout.labelsep,
- GetFont(bview->buffer(), row->par(), -2));
+ getLabelFont(bview->buffer(), row->par()));
if (main_body-1 <= last)
x += fill_label_hfill;
}
* realize, that you left an empty paragraph, they will delete it.
* They also delete the corresponding row */
-void LyXText::CursorRightOneWord(BufferView * bview) const
+void LyXText::cursorRightOneWord(BufferView * bview) const
{
// treat floats, HFills and Insets as words
LyXCursor tmpcursor = cursor;
// CHECK See comment on top of text.C
-#ifndef NEW_INSETS
- if (tmpcursor.pos() == tmpcursor.par()->Last()
-#else
if (tmpcursor.pos() == tmpcursor.par()->size()
-#endif
&& tmpcursor.par()->next()) {
tmpcursor.par(tmpcursor.par()->next());
tmpcursor.pos(0);
int steps = 0;
// Skip through initial nonword stuff.
-#ifndef NEW_INSETS
- while (tmpcursor.pos() < tmpcursor.par()->Last() &&
-#else
while (tmpcursor.pos() < tmpcursor.par()->size() &&
-#endif
- ! tmpcursor.par()->IsWord( tmpcursor.pos() ) )
- {
+ ! tmpcursor.par()->isWord(tmpcursor.pos())) {
// printf("Current pos1 %d", tmpcursor.pos()) ;
tmpcursor.pos(tmpcursor.pos() + 1);
++steps;
}
// Advance through word.
-#ifndef NEW_INSETS
- while (tmpcursor.pos() < tmpcursor.par()->Last() &&
-#else
while (tmpcursor.pos() < tmpcursor.par()->size() &&
-#endif
- tmpcursor.par()->IsWord( tmpcursor.pos() ) )
- {
+ tmpcursor.par()->isWord( tmpcursor.pos())) {
// printf("Current pos2 %d", tmpcursor.pos()) ;
tmpcursor.pos(tmpcursor.pos() + 1);
++steps;
}
}
- SetCursor(bview, tmpcursor.par(), tmpcursor.pos());
+ setCursor(bview, tmpcursor.par(), tmpcursor.pos());
}
-void LyXText::CursorTab(BufferView * bview) const
+void LyXText::cursorTab(BufferView * bview) const
{
LyXCursor tmpcursor = cursor;
-#ifndef NEW_INSETS
- while (tmpcursor.pos() < tmpcursor.par()->Last()
-#else
while (tmpcursor.pos() < tmpcursor.par()->size()
-#endif
- && !tmpcursor.par()->IsNewline(tmpcursor.pos()))
+ && !tmpcursor.par()->isNewline(tmpcursor.pos()))
tmpcursor.pos(tmpcursor.pos() + 1);
-#ifndef NEW_INSETS
- if (tmpcursor.pos() == tmpcursor.par()->Last()){
-#else
if (tmpcursor.pos() == tmpcursor.par()->size()){
-#endif
if (tmpcursor.par()->next()) {
tmpcursor.par(tmpcursor.par()->next());
tmpcursor.pos(0);
}
} else
tmpcursor.pos(tmpcursor.pos() + 1);
- SetCursor(bview, tmpcursor.par(), tmpcursor.pos());
+ 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. */
-void LyXText::CursorLeftOneWord(BufferView * bview) const
+void LyXText::cursorLeftOneWord(BufferView * bview) const
{
- // treat HFills, floats and Insets as words
LyXCursor tmpcursor = cursor;
- while (tmpcursor.pos()
- && (tmpcursor.par()->IsSeparator(tmpcursor.pos() - 1)
- || tmpcursor.par()->IsKomma(tmpcursor.pos() - 1))
- && !(tmpcursor.par()->IsHfill(tmpcursor.pos() - 1)
-#ifndef NEW_INSETS
- || tmpcursor.par()->IsFloat(tmpcursor.pos() - 1)
-#endif
- || tmpcursor.par()->IsInset(tmpcursor.pos() - 1)))
- tmpcursor.pos(tmpcursor.pos() - 1);
+ cursorLeftOneWord(tmpcursor);
+ setCursor(bview, tmpcursor.par(), tmpcursor.pos());
+}
- if (tmpcursor.pos()
- && (tmpcursor.par()->IsInset(tmpcursor.pos() - 1)
-#ifndef NEW_INSETS
- || tmpcursor.par()->IsFloat(tmpcursor.pos() - 1)
-#endif
- || tmpcursor.par()->IsHfill(tmpcursor.pos() - 1))) {
- tmpcursor.pos(tmpcursor.pos() - 1);
- } else if (!tmpcursor.pos()) {
- if (tmpcursor.par()->previous()){
- tmpcursor.par(tmpcursor.par()->previous());
-#ifndef NEW_INSETS
- tmpcursor.pos(tmpcursor.par()->Last());
-#else
- tmpcursor.pos(tmpcursor.par()->size());
-#endif
- }
- } else { // Here, tmpcursor != 0
- while (tmpcursor.pos() > 0 &&
- tmpcursor.par()->IsWord(tmpcursor.pos()-1) )
- tmpcursor.pos(tmpcursor.pos() - 1);
+void LyXText::cursorLeftOneWord(LyXCursor & cur) const
+{
+ // treat HFills, floats and Insets as words
+ cur = cursor;
+ 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)))
+ cur.pos(cur.pos() - 1);
+
+ if (cur.pos()
+ && (cur.par()->isInset(cur.pos() - 1)
+ || cur.par()->isHfill(cur.pos() - 1))) {
+ cur.pos(cur.pos() - 1);
+ } else if (!cur.pos()) {
+ if (cur.par()->previous()){
+ cur.par(cur.par()->previous());
+ cur.pos(cur.par()->size());
+ }
+ } else { // Here, cur != 0
+ while (cur.pos() > 0 &&
+ cur.par()->isWord(cur.pos()-1) )
+ cur.pos(cur.pos() - 1);
}
- SetCursor(bview, tmpcursor.par(), tmpcursor.pos());
}
-/* -------> Select current word. This depends on behaviour of CursorLeftOneWord(), so it is
- patched as well. */
-
-void LyXText::SelectWord(BufferView * bview)
+/* -------> Select current word. This depends on behaviour of
+CursorLeftOneWord(), so it is patched as well. */
+void LyXText::getWord(LyXCursor & from, LyXCursor & to,
+ word_location const loc) const
{
- // Move cursor to the beginning, when not already there.
- if (cursor.pos()
- && !cursor.par()->IsSeparator(cursor.pos()-1)
- && !cursor.par()->IsKomma(cursor.pos()-1) )
- CursorLeftOneWord(bview);
+ // first put the cursor where we wana start to select the word
+ from = cursor;
+ switch(loc) {
+ case WHOLE_WORD_STRICT:
+ if (cursor.pos() == 0 || cursor.pos() == cursor.par()->size()
+ || cursor.par()->isSeparator(cursor.pos())
+ || cursor.par()->isKomma(cursor.pos())
+ || cursor.par()->isSeparator(cursor.pos() -1)
+ || cursor.par()->isKomma(cursor.pos() -1)) {
+ to = from;
+ 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)
+ && !from.par()->isKomma(from.pos() - 1))
+ cursorLeftOneWord(from);
+ break;
+ case PREVIOUS_WORD:
+ // always move the cursor to the beginning of previous word
+ cursorLeftOneWord(from);
+ break;
+ case NEXT_WORD:
+ lyxerr << "LyXText::getWord: NEXT_WORD not implemented yet\n";
+ break;
+ case PARTIAL_WORD:
+ break;
+ }
+ to = from;
+ while (to.pos() < to.par()->size()
+ && !to.par()->isSeparator(to.pos())
+ && !to.par()->isKomma(to.pos())
+ && !to.par()->isHfill(to.pos()) )
+ {
+ to.pos(to.pos() + 1);
+ }
+}
- // set the sel cursor
- sel_cursor = cursor;
-#ifndef NEW_INSETS
- while (cursor.pos() < cursor.par()->Last()
-#else
- while (cursor.pos() < cursor.par()->size()
-#endif
- && !cursor.par()->IsSeparator(cursor.pos())
- && !cursor.par()->IsKomma(cursor.pos()) )
- cursor.pos(cursor.pos() + 1);
- SetCursor(bview, cursor.par(), cursor.pos() );
-
- // finally set the selection
- SetSelection(bview);
+void LyXText::selectWord(BufferView * bview, word_location const loc)
+{
+ LyXCursor from;
+ LyXCursor to;
+ getWord(from, to, loc);
+ if (cursor != from)
+ setCursor(bview, from.par(), from.pos());
+ if (to == from)
+ return;
+ selection.cursor = cursor;
+ setCursor(bview, to.par(), to.pos() );
+ setSelection(bview);
}
-/* -------> Select the word currently under the cursor when:
- 1: no selection is currently set,
- 2: the cursor is not at the borders of the word. */
-
-bool LyXText::SelectWordWhenUnderCursor(BufferView * bview)
+/* -------> Select the word currently under the cursor when no
+ selection is currently set */
+bool LyXText::selectWordWhenUnderCursor(BufferView * bview,
+ word_location const loc)
{
- if (!selection &&
-#ifndef NEW_INSETS
- cursor.pos() > 0 && cursor.pos() < cursor.par()->Last()
-#else
- cursor.pos() > 0 && cursor.pos() < cursor.par()->size()
-#endif
- && !cursor.par()->IsSeparator(cursor.pos())
- && !cursor.par()->IsKomma(cursor.pos())
- && !cursor.par()->IsSeparator(cursor.pos() -1)
- && !cursor.par()->IsKomma(cursor.pos() -1)) {
- SelectWord(bview);
- return true;
+ if (!selection.set()) {
+ selectWord(bview, loc);
+ return selection.set();
}
return false;
}
// 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
{
- LyXParagraph * tmppar = cursor.par();
+ if (the_locking_inset) {
+ 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)
+#warning DEKEL!
+ // we have to go on checking so move cusor to the right
+ if (cursor.pos() == cursor.par()->size()) {
+ if (!cursor.par()->next())
+ return str;
+ cursor.par(cursor.par()->next());
+ cursor.pos(0);
+ } else
+ 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.
-#ifndef NEW_INSETS
- if (cursor.pos() || cursor.par()->previous_) {
- while (cursor.pos() < cursor.par()->Last()
- && cursor.par()->IsLetter(cursor.pos()))
- cursor.pos(cursor.pos() + 1);
- }
-#else
if (cursor.pos() || cursor.par()->previous()) {
while (cursor.pos() < cursor.par()->size()
- && cursor.par()->IsLetter(cursor.pos()))
+ && cursor.par()->isLetter(cursor.pos()))
cursor.pos(cursor.pos() + 1);
}
-#endif
// Now, skip until we have real text (will jump paragraphs)
-#ifndef NEW_INSETS
- while ((cursor.par()->Last() > cursor.pos()
-#else
while ((cursor.par()->size() > cursor.pos()
-#endif
- && (!cursor.par()->IsLetter(cursor.pos())
- || cursor.par()->getFont(bview->buffer()->params, cursor.pos())
- .latex() == LyXFont::ON))
-#ifndef NEW_INSETS
- || (cursor.par()->Last() == cursor.pos()
-#else
+ && (!cursor.par()->isLetter(cursor.pos()))
+ && (!cursor.par()->isInset(cursor.pos()) ||
+ !cursor.par()->getInset(cursor.pos())->allowSpellcheck()))
|| (cursor.par()->size() == cursor.pos()
-#endif
- && cursor.par()->next())){
-#ifndef NEW_INSETS
- if (cursor.pos() == cursor.par()->Last()) {
-#else
+ && cursor.par()->next()))
+ {
if (cursor.pos() == cursor.par()->size()) {
-#endif
cursor.par(cursor.par()->next());
cursor.pos(0);
} else
cursor.pos(cursor.pos() + 1);
}
+
+ // now check if we hit an inset so it has to be a inset containing text!
+ if (cursor.pos() < cursor.par()->size() &&
+ cursor.par()->isInset(cursor.pos()))
+ {
+ // 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->selectNextWordToSpellcheck(bview, value);
+ }
// Update the value if we changed paragraphs
if (cursor.par() != tmppar){
- SetCursor(bview, cursor.par(), cursor.pos());
+ setCursor(bview, cursor.par(), cursor.pos());
value = float(cursor.y())/float(height);
}
// Start the selection from here
- sel_cursor = cursor;
-
- std::ostringstream latex;
-
- // and find the end of the word
- // (optional hyphens are part of a word)
-#ifndef NEW_INSETS
- while (cursor.pos() < cursor.par()->Last()
-#else
+ selection.cursor = cursor;
+
+ // 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()
-#endif
- && (cursor.par()->IsLetter(cursor.pos()))
- || (cursor.par()->GetChar(cursor.pos()) == LyXParagraph::META_INSET
- && cursor.par()->GetInset(cursor.pos()) != 0
- && cursor.par()->GetInset(cursor.pos())->Latex(bview->buffer(), latex, false, false) == 0
- && latex.str() == "\\-"
- ))
+ && (cursor.par()->isLetter(cursor.pos())))
cursor.pos(cursor.pos() + 1);
// Finally, we copy the word to a string and return it
string str;
- if (sel_cursor.pos() < cursor.pos()) {
- LyXParagraph::size_type i;
- for (i = sel_cursor.pos(); i < cursor.pos(); ++i) {
- if (cursor.par()->GetChar(i) != LyXParagraph::META_INSET)
- str += cursor.par()->GetChar(i);
+ if (selection.cursor.pos() < cursor.pos()) {
+ Paragraph::size_type i;
+ for (i = selection.cursor.pos(); i < cursor.pos(); ++i) {
+ if (!cursor.par()->isInset(i))
+ str += cursor.par()->getChar(i);
}
}
return str;
// This one is also only for the spellchecker
-void LyXText::SelectSelectedWord(BufferView * bview)
+void LyXText::selectSelectedWord(BufferView * bview)
{
+ if (the_locking_inset) {
+ the_locking_inset->selectSelectedWord(bview);
+ return;
+ }
// move cursor to the beginning
- SetCursor(bview, sel_cursor.par(), sel_cursor.pos());
+ setCursor(bview, selection.cursor.par(), selection.cursor.pos());
// set the sel cursor
- sel_cursor = cursor;
-
- std::ostringstream latex;
+ selection.cursor = cursor;
// now find the end of the word
-#ifndef NEW_INSETS
- while (cursor.pos() < cursor.par()->Last()
-#else
while (cursor.pos() < cursor.par()->size()
-#endif
- && (cursor.par()->IsLetter(cursor.pos())
- || (cursor.par()->GetChar(cursor.pos()) == LyXParagraph::META_INSET
- && cursor.par()->GetInset(cursor.pos()) != 0
- && cursor.par()->GetInset(cursor.pos())->Latex(bview->buffer(), latex, false, false) == 0
- && latex.str() == "\\-"
- )))
+ && (cursor.par()->isLetter(cursor.pos())))
cursor.pos(cursor.pos() + 1);
- SetCursor(bview, cursor.par(), cursor.pos());
+ setCursor(bview, cursor.par(), cursor.pos());
// finally set the selection
- SetSelection(bview);
+ setSelection(bview);
}
/* -------> Delete from cursor up to the end of the current or next word. */
-void LyXText::DeleteWordForward(BufferView * bview)
+void LyXText::deleteWordForward(BufferView * bview)
{
-#ifndef NEW_INSETS
- if (!cursor.par()->Last())
-#else
if (!cursor.par()->size())
-#endif
- CursorRight(bview);
+ cursorRight(bview);
else {
LyXCursor tmpcursor = cursor;
tmpcursor.row(0); //Â ??
- selection = true; // to avoid deletion
- CursorRightOneWord(bview);
- SetCursor(bview, tmpcursor, tmpcursor.par(), tmpcursor.pos());
- sel_cursor = cursor;
+ selection.set(true); // to avoid deletion
+ cursorRightOneWord(bview);
+ setCursor(bview, tmpcursor, tmpcursor.par(), tmpcursor.pos());
+ selection.cursor = cursor;
cursor = tmpcursor;
- SetSelection(bview);
+ setSelection(bview);
/* -----> Great, CutSelection() gets rid of multiple spaces. */
- CutSelection(bview);
+ cutSelection(bview, true, false);
}
}
/* -------> Delete from cursor to start of current or prior word. */
-void LyXText::DeleteWordBackward(BufferView * bview)
+void LyXText::deleteWordBackward(BufferView * bview)
{
-#ifndef NEW_INSETS
- if (!cursor.par()->Last())
-#else
if (!cursor.par()->size())
-#endif
- CursorLeft(bview);
+ cursorLeft(bview);
else {
LyXCursor tmpcursor = cursor;
tmpcursor.row(0); // ??
- selection = true; // to avoid deletion
- CursorLeftOneWord(bview);
- SetCursor(bview, tmpcursor, tmpcursor.par(), tmpcursor.pos());
- sel_cursor = cursor;
+ selection.set(true); // to avoid deletion
+ cursorLeftOneWord(bview);
+ setCursor(bview, tmpcursor, tmpcursor.par(), tmpcursor.pos());
+ selection.cursor = cursor;
cursor = tmpcursor;
- SetSelection(bview);
- CutSelection(bview);
+ setSelection(bview);
+ cutSelection(bview, true, false);
}
}
/* -------> Kill to end of line. */
-void LyXText::DeleteLineForward(BufferView * bview)
+void LyXText::deleteLineForward(BufferView * bview)
{
-#ifndef NEW_INSETS
- if (!cursor.par()->Last())
-#else
if (!cursor.par()->size())
-#endif
// Paragraph is empty, so we just go to the right
- CursorRight(bview);
+ cursorRight(bview);
else {
LyXCursor tmpcursor = cursor;
- // We can't store the row over a regular SetCursor
+ // We can't store the row over a regular setCursor
// so we set it to 0 and reset it afterwards.
tmpcursor.row(0); //Â ??
- selection = true; // to avoid deletion
- CursorEnd(bview);
- SetCursor(bview, tmpcursor, tmpcursor.par(), tmpcursor.pos());
- sel_cursor = cursor;
+ selection.set(true); // to avoid deletion
+ cursorEnd(bview);
+ setCursor(bview, tmpcursor, tmpcursor.par(), tmpcursor.pos());
+ selection.cursor = cursor;
cursor = tmpcursor;
- SetSelection(bview);
+ setSelection(bview);
// What is this test for ??? (JMarc)
- if (!selection) {
- DeleteWordForward(bview);
+ if (!selection.set()) {
+ deleteWordForward(bview);
} else {
- CutSelection(bview);
+ cutSelection(bview, true, false);
}
}
}
// Change the case of a word at cursor position.
-// This function directly manipulates LyXParagraph::text because there
-// is no LyXParagraph::SetChar currently. I did what I could to ensure
+// 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
-// LyXParagraph, but it will have to change for 1.1 anyway. At least
+// Paragraph, but it will have to change for 1.1 anyway. At least
// it does not access outside of the allocated array as the older
// version did. (JMarc)
-void LyXText::ChangeWordCase(BufferView * bview, LyXText::TextCase action)
+void LyXText::changeCase(BufferView * bview, LyXText::TextCase action)
{
-#ifndef NEW_INSETS
- LyXParagraph * tmppar = cursor.par()->ParFromPos(cursor.pos());
+ LyXCursor from;
+ LyXCursor to;
- SetUndo(bview->buffer(),Undo::FINISH,
- tmppar->previous_, tmppar->next_);
+ if (selection.set()) {
+ from = selection.start;
+ to = selection.end;
+ } else {
+ getWord(from, to, PARTIAL_WORD);
+ setCursor(bview, to.par(), to.pos() + 1);
+ }
- LyXParagraph::size_type tmppos =
- cursor.par()->PositionInParFromPos(cursor.pos());
-#else
- LyXParagraph * tmppar = cursor.par();
+ changeRegionCase(bview, from, to, action);
+}
- SetUndo(bview->buffer(),Undo::FINISH,
- tmppar->previous(), tmppar->next());
- LyXParagraph::size_type tmppos = cursor.pos();
-#endif
+void LyXText::changeRegionCase(BufferView * bview,
+ LyXCursor const & from,
+ LyXCursor const & to,
+ LyXText::TextCase action)
+{
+ lyx::Assert(from <= to);
+
+ setUndo(bview, Undo::FINISH,
+ from.par(), to.par()->next());
- while (tmppos < tmppar->size()) {
- unsigned char c = tmppar->GetChar(tmppos);
- if (IsKommaChar(c) || IsLineSeparatorChar(c))
- break;
- if (c != LyXParagraph::META_INSET) {
+ Paragraph::size_type pos = from.pos();
+ Paragraph * par = from.par();
+
+ while (par && (pos != to.pos() || par != to.par())) {
+ unsigned char c = par->getChar(pos);
+ 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;
}
}
-
- //tmppar->text[tmppos] = c;
- tmppar->SetChar(tmppos, c);
- ++tmppos;
+ par->setChar(pos, c);
+ checkParagraph(bview, par, pos);
+
+ ++pos;
+ if (pos == par->size()) {
+ par = par->next();
+ pos = 0;
+ }
+ }
+ if (to.row() != from.row()) {
+ refresh_y = from.y() - from.row()->baseline();
+ refresh_row = from.row();
+ status(bview, LyXText::NEED_MORE_REFRESH);
}
- CheckParagraph(bview, tmppar, tmppos);
- CursorRightOneWord(bview);
+}
+
+
+void LyXText::transposeChars(BufferView & bview)
+{
+ Paragraph * tmppar = cursor.par();
+
+ setUndo(&bview, Undo::FINISH,
+ tmppar, tmppar->next());
+
+ Paragraph::size_type tmppos = cursor.pos();
+
+ // First decide if it is possible to transpose at all
+
+ // We are at the beginning of a paragraph.
+ if (tmppos == 0) return;
+
+ // We are at the end of a paragraph.
+ if (tmppos == tmppar->size() - 1) return;
+
+ unsigned char c1 = tmppar->getChar(tmppos);
+ unsigned char c2 = tmppar->getChar(tmppos - 1);
+
+ if (c1 != Paragraph::META_INSET
+ && c2 != Paragraph::META_INSET) {
+ tmppar->setChar(tmppos, c2);
+ tmppar->setChar(tmppos - 1, c1);
+ }
+ // We should have an implementation that handles insets
+ // as well, but that will have to come later. (Lgb)
+ checkParagraph(const_cast<BufferView*>(&bview), tmppar, tmppos);
}
LyXCursor old_cursor = cursor;
int const old_cur_par_id = old_cursor.par()->id();
-#ifndef NEW_INSETS
- int const old_cur_par_prev_id = old_cursor.par()->previous_ ?
- old_cursor.par()->previous_->id() : 0;
-#else
int const old_cur_par_prev_id = old_cursor.par()->previous() ?
old_cursor.par()->previous()->id() : 0;
-#endif
// just move to the right
- CursorRight(bview);
+ cursorRight(bview);
// CHECK Look at the comment here.
// This check is not very good...
- // The CursorRightIntern calls DeleteEmptyParagrapgMechanism
+ // The cursorRightIntern calls DeleteEmptyParagrapgMechanism
// and that can very well delete the par or par->previous in
// old_cursor. Will a solution where we compare paragraph id's
//work better?
- if (
-#ifndef NEW_INSETS
- (cursor.par()->previous_ ? cursor.par()->previous_->id() : 0)
-#else
- (cursor.par()->previous() ? cursor.par()->previous()->id() : 0)
-#endif
+ 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
- SetUndo(bview->buffer(), Undo::DELETE,
-#ifndef NEW_INSETS
- cursor.par()->ParFromPos(cursor.pos())->previous_,
- cursor.par()->ParFromPos(cursor.pos())->next_
-#else
- cursor.par()->previous(),
- cursor.par()->next()
-#endif
- );
+ // to make sure undo gets the right cursor position
+ cursor = old_cursor;
+ setUndo(bview, Undo::DELETE,
+ cursor.par(), cursor.par()->next());
cursor = tmpcursor;
- Backspace(bview);
+ backspace(bview);
}
}
-void LyXText::Backspace(BufferView * bview)
+void LyXText::backspace(BufferView * bview)
{
// Get the font that is used to calculate the baselineskip
-#ifndef NEW_INSETS
- LyXParagraph::size_type lastpos = cursor.par()->Last();
-#else
- LyXParagraph::size_type lastpos = cursor.par()->size();
-#endif
- LyXFont rawparfont = cursor.par()->GetFontSettings(bview->buffer()->params,
- lastpos - 1);
+ Paragraph::size_type lastpos = cursor.par()->size();
+ LyXFont rawparfont =
+ cursor.par()->getFontSettings(bview->buffer()->params,
+ lastpos - 1);
if (cursor.pos() == 0) {
// The cursor is at the beginning of a paragraph,
// is it an empty paragraph?
if ((lastpos == 0
- || (lastpos == 1 && cursor.par()->IsSeparator(0)))
-#ifndef NEW_INSETS
- && !(cursor.par()->next()
- && cursor.par()->footnoteflag == LyXParagraph::NO_FOOTNOTE
- && cursor.par()->next()->footnoteflag == LyXParagraph::OPEN_FOOTNOTE)
-#endif
- ) {
+ || (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.
-#ifndef NEW_INSETS
- if (cursor.par()->previous_) {
- LyXParagraph * tmppar = cursor.par()->previous_->FirstPhysicalPar();
- if (cursor.par()->GetLayout() == tmppar->GetLayout()
- && cursor.par()->footnoteflag == tmppar->footnoteflag
-#else
if (cursor.par()->previous()) {
- LyXParagraph * tmppar = cursor.par()->previous();
- if (cursor.par()->GetLayout() == tmppar->GetLayout()
-#endif
- && cursor.par()->GetAlign() == tmppar->GetAlign()) {
+ Paragraph * tmppar = cursor.par()->previous();
+ if (cursor.par()->getLayout() == tmppar->getLayout()
+ && cursor.par()->getAlign() == tmppar->getAlign()) {
// Inherit bottom DTD from the paragraph below.
// (the one we are deleting)
- tmppar->params.lineBottom(cursor.par()->params.lineBottom());
- tmppar->params.spaceBottom(cursor.par()->params.spaceBottom());
- tmppar->params.pagebreakBottom(cursor.par()->params.pagebreakBottom());
+ tmppar->params().lineBottom(cursor.par()->params().lineBottom());
+ tmppar->params().spaceBottom(cursor.par()->params().spaceBottom());
+ tmppar->params().pagebreakBottom(cursor.par()->params().pagebreakBottom());
}
- CursorLeft(bview);
+ cursorLeft(bview);
// the layout things can change the height of a row !
int const tmpheight = cursor.row()->height();
- SetHeightOfRow(bview, cursor.row());
+ setHeightOfRow(bview, cursor.row());
if (cursor.row()->height() != tmpheight) {
refresh_y = cursor.y() - cursor.row()->baseline();
refresh_row = cursor.row();
- status = LyXText::NEED_MORE_REFRESH;
+ status(bview, LyXText::NEED_MORE_REFRESH);
}
return;
}
}
-#ifndef NEW_INSETS
- if (cursor.par()->ParFromPos(cursor.pos())->previous_) {
- SetUndo(bview->buffer(), Undo::DELETE,
- cursor.par()->ParFromPos(cursor.pos())->previous_->previous_,
- cursor.par()->ParFromPos(cursor.pos())->next_);
- }
-#else
if (cursor.par()->previous()) {
- SetUndo(bview->buffer(), Undo::DELETE,
- cursor.par()->previous()->previous(),
- cursor.par()->next());
+ setUndo(bview, Undo::DELETE,
+ cursor.par()->previous(), cursor.par()->next());
}
-#endif
- LyXParagraph * tmppar = cursor.par();
+ Paragraph * tmppar = cursor.par();
Row * tmprow = cursor.row();
- // We used to do CursorLeftIntern() here, but it is
+ // 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,
+ // mechanism. So we do a cursorLeftIntern()-lite,
// without the dreaded mechanism. (JMarc)
if (cursor.par()->previous()) {
// steps into the above paragraph.
-#ifndef NEW_INSETS
- SetCursorIntern(bview, cursor.par()->previous(),
- cursor.par()->previous()->Last(), false);
-#else
- SetCursorIntern(bview, cursor.par()->previous(),
- cursor.par()->previous()->size(),
- false);
-#endif
+ setCursorIntern(bview, cursor.par()->previous(),
+ cursor.par()->previous()->size(),
+ false);
}
/* Pasting is not allowed, if the paragraphs have different
Correction: Pasting is always allowed with standard-layout
*/
if (cursor.par() != tmppar
- && (cursor.par()->GetLayout() == tmppar->GetLayout()
- || tmppar->GetLayout() == 0 /*standard*/)
-#ifndef NEW_INSETS
- && cursor.par()->footnoteflag == tmppar->footnoteflag
-#endif
- && cursor.par()->GetAlign() == tmppar->GetAlign()) {
-
- RemoveParagraph(tmprow);
- RemoveRow(tmprow);
- cursor.par()->PasteParagraph(bview->buffer()->params);
+ && (cursor.par()->getLayout() == tmppar->getLayout()
+ || tmppar->getLayout() == 0 /*standard*/)
+ && 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(), ' ');
+ if (!cursor.pos() || !cursor.par()->isSeparator(cursor.pos() - 1))
+ ; //cursor.par()->insertChar(cursor.pos(), ' ');
// strangely enough it seems that commenting out the line above removes
// most or all of the segfaults. I will however also try to move the
// two Remove... lines in front of the PasteParagraph too.
if (cursor.pos())
cursor.pos(cursor.pos() - 1);
- status = LyXText::NEED_MORE_REFRESH;
+ status(bview, LyXText::NEED_MORE_REFRESH);
refresh_row = cursor.row();
refresh_y = cursor.y() - cursor.row()->baseline();
//RemoveRow(tmprow);
// This rebuilds the rows.
- AppendParagraph(bview, cursor.row());
- UpdateCounters(bview, cursor.row());
+ appendParagraph(bview, cursor.row());
+ updateCounters(bview, cursor.row());
// the row may have changed, block, hfills etc.
- SetCursor(bview, cursor.par(), cursor.pos(), false);
+ setCursor(bview, cursor.par(), cursor.pos(), false);
}
} else {
/* this is the code for a normal backspace, not pasting
* any paragraphs */
- SetUndo(bview->buffer(), Undo::DELETE,
-#ifndef NEW_INSETS
- cursor.par()->ParFromPos(cursor.pos())->previous_,
- cursor.par()->ParFromPos(cursor.pos())->next_
-#else
- cursor.par()->previous(),
- cursor.par()->next()
-#endif
- );
- // We used to do CursorLeftIntern() here, but it is
+ setUndo(bview, Undo::DELETE,
+ 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,
+ // mechanism. So we do a cursorLeftIntern()-lite,
// without the dreaded mechanism. (JMarc)
- SetCursorIntern(bview, cursor.par(), cursor.pos()- 1,
- false, cursor.boundary());
+ setCursorIntern(bview, cursor.par(), cursor.pos()- 1,
+ false, cursor.boundary());
// some insets are undeletable here
- if (cursor.par()->GetChar(cursor.pos()) == LyXParagraph::META_INSET) {
- if (!cursor.par()->GetInset(cursor.pos())->Deletable())
+ if (cursor.par()->getChar(cursor.pos()) == Paragraph::META_INSET) {
+ if (!cursor.par()->getInset(cursor.pos())->deletable())
return;
// force complete redo when erasing display insets
// this is a cruel method but safe..... Matthias
- if (cursor.par()->GetInset(cursor.pos())->display() ||
- cursor.par()->GetInset(cursor.pos())->needFullRow()) {
- cursor.par()->Erase(cursor.pos());
- RedoParagraph(bview);
+ if (cursor.par()->getInset(cursor.pos())->display() ||
+ cursor.par()->getInset(cursor.pos())->needFullRow()) {
+ cursor.par()->erase(cursor.pos());
+ redoParagraph(bview);
return;
}
}
Row * row = cursor.row();
int y = cursor.y() - row->baseline();
- LyXParagraph::size_type z;
+ Paragraph::size_type z;
/* remember that a space at the end of a row doesnt count
* when calculating the fill */
- if (cursor.pos() < RowLast(row) ||
- !cursor.par()->IsLineSeparator(cursor.pos())) {
- row->fill(row->fill() + SingleWidth(bview,
- cursor.par(),
- cursor.pos()));
+ if (cursor.pos() < rowLast(row) ||
+ !cursor.par()->isLineSeparator(cursor.pos())) {
+ row->fill(row->fill() + singleWidth(bview,
+ cursor.par(),
+ cursor.pos()));
}
/* some special code when deleting a newline. This is similar
* to the behavior when pasting paragraphs */
- if (cursor.pos() && cursor.par()->IsNewline(cursor.pos())) {
- cursor.par()->Erase(cursor.pos());
+ if (cursor.pos() && cursor.par()->isNewline(cursor.pos())) {
+ cursor.par()->erase(cursor.pos());
// refresh the positions
Row * tmprow = row;
while (tmprow->next() && tmprow->next()->par() == row->par()) {
tmprow = tmprow->next();
tmprow->pos(tmprow->pos() - 1);
}
- if (cursor.par()->IsLineSeparator(cursor.pos() - 1))
+ if (cursor.par()->isLineSeparator(cursor.pos() - 1))
cursor.pos(cursor.pos() - 1);
-#ifndef NEW_INSETS
- if (cursor.pos() < cursor.par()->Last()
- && !cursor.par()->IsSeparator(cursor.pos())) {
-#else
if (cursor.pos() < cursor.par()->size()
- && !cursor.par()->IsSeparator(cursor.pos())) {
-#endif
- cursor.par()->InsertChar(cursor.pos(), ' ');
- SetCharFont(bview->buffer(), cursor.par(),
+ && !cursor.par()->isSeparator(cursor.pos())) {
+ cursor.par()->insertChar(cursor.pos(), ' ');
+ setCharFont(bview->buffer(), cursor.par(),
cursor.pos(), current_font);
// refresh the positions
tmprow = row;
}
}
} else {
- cursor.par()->Erase(cursor.pos());
+ cursor.par()->erase(cursor.pos());
// refresh the positions
Row * tmprow = row;
}
// delete newlines at the beginning of paragraphs
-#ifndef NEW_INSETS
- while (cursor.par()->Last() &&
-#else
while (cursor.par()->size() &&
-#endif
- cursor.par()->IsNewline(cursor.pos()) &&
- cursor.pos() == BeginningOfMainBody(bview->buffer(),
+ cursor.par()->isNewline(cursor.pos()) &&
+ cursor.pos() == beginningOfMainBody(bview->buffer(),
cursor.par())) {
- cursor.par()->Erase(cursor.pos());
+ cursor.par()->erase(cursor.pos());
// refresh the positions
tmprow = row;
while (tmprow->next() &&
// is there a break one row above
if (row->previous() && row->previous()->par() == row->par()) {
- z = NextBreakPoint(bview, row->previous(),
+ 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
-#ifndef NEW_INSETS
- if (row->pos() >= row->par()->Last()) {
-#else
if (row->pos() >= row->par()->size()) {
-#endif
// remove it
- RemoveRow(row);
+ removeRow(row);
need_break_row = 0;
} else {
- BreakAgainOneRow(bview, row);
+ breakAgainOneRow(bview, row);
if (row->next() && row->next()->par() == row->par())
need_break_row = row->next();
else
// set the dimensions of the row above
y -= tmprow->height();
- tmprow->fill(Fill(bview, tmprow,
+ tmprow->fill(fill(bview, tmprow,
workWidth(bview)));
- SetHeightOfRow(bview, tmprow);
+ setHeightOfRow(bview, tmprow);
refresh_y = y;
refresh_row = tmprow;
- status = LyXText::NEED_MORE_REFRESH;
- SetCursor(bview, cursor.par(), cursor.pos(),
+ status(bview, LyXText::NEED_MORE_REFRESH);
+ setCursor(bview, cursor.par(), cursor.pos(),
false, cursor.boundary());
//current_font = rawtmpfont;
//real_current_font = realtmpfont;
// check, whether the last character's font has changed.
-#ifndef NEW_INSETS
if (rawparfont !=
- cursor.par()->GetFontSettings(bview->buffer()->params,
- cursor.par()->Last() - 1))
-#else
- if (rawparfont !=
- cursor.par()->GetFontSettings(bview->buffer()->params,
+ cursor.par()->getFontSettings(bview->buffer()->params,
cursor.par()->size() - 1))
-#endif
- RedoHeightOfParagraph(bview, cursor);
+ redoHeightOfParagraph(bview, cursor);
return;
}
}
// break the cursor row again
if (row->next() && row->next()->par() == row->par() &&
-#ifndef NEW_INSETS
- (RowLast(row) == row->par()->Last() - 1 ||
-#else
- (RowLast(row) == row->par()->size() - 1 ||
-#endif
- NextBreakPoint(bview, row, workWidth(bview)) != RowLast(row))) {
+ (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
* hack ;-) */
-#ifndef NEW_INSETS
- if (RowLast(row) == row->par()->Last() - 1)
-#else
- if (RowLast(row) == row->par()->size() - 1)
-#endif
- RemoveRow(row->next());
+ if (rowLast(row) == row->par()->size() - 1)
+ removeRow(row->next());
refresh_y = y;
refresh_row = row;
- status = LyXText::NEED_MORE_REFRESH;
+ status(bview, LyXText::NEED_MORE_REFRESH);
- BreakAgainOneRow(bview, row);
+ breakAgainOneRow(bview, row);
// will the cursor be in another row now?
if (row->next() && row->next()->par() == row->par() &&
- RowLast(row) <= cursor.pos()) {
+ rowLast(row) <= cursor.pos()) {
row = row->next();
- BreakAgainOneRow(bview, row);
+ breakAgainOneRow(bview, row);
}
- SetCursor(bview, cursor.par(), cursor.pos(), false, cursor.boundary());
+ setCursor(bview, cursor.par(), cursor.pos(), false, cursor.boundary());
if (row->next() && row->next()->par() == row->par())
need_break_row = row->next();
need_break_row = 0;
} else {
// set the dimensions of the row
- row->fill(Fill(bview, row, workWidth(bview)));
+ row->fill(fill(bview, row, workWidth(bview)));
int const tmpheight = row->height();
- SetHeightOfRow(bview, row);
+ setHeightOfRow(bview, row);
if (tmpheight == row->height())
- status = LyXText::NEED_VERY_LITTLE_REFRESH;
+ status(bview, LyXText::NEED_VERY_LITTLE_REFRESH);
else
- status = LyXText::NEED_MORE_REFRESH;
+ status(bview, LyXText::NEED_MORE_REFRESH);
refresh_y = y;
refresh_row = row;
- SetCursor(bview, cursor.par(), cursor.pos(), false, cursor.boundary());
+ setCursor(bview, cursor.par(), cursor.pos(), false, cursor.boundary());
}
}
// current_font = rawtmpfont;
// real_current_font = realtmpfont;
- if (IsBoundary(bview->buffer(), cursor.par(), cursor.pos())
+ if (isBoundary(bview->buffer(), cursor.par(), cursor.pos())
!= cursor.boundary())
- SetCursor(bview, cursor.par(), cursor.pos(), false,
+ setCursor(bview, cursor.par(), cursor.pos(), false,
!cursor.boundary());
-#ifndef NEW_INSETS
- lastpos = cursor.par()->Last();
-#else
lastpos = cursor.par()->size();
-#endif
if (cursor.pos() == lastpos)
- SetCurrentFont(bview);
+ setCurrentFont(bview);
// check, whether the last characters font has changed.
if (rawparfont !=
- cursor.par()->GetFontSettings(bview->buffer()->params, lastpos - 1)) {
- RedoHeightOfParagraph(bview, cursor);
+ 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);
+ cursor.par()->getLayout()).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);
-
- LyXParagraph::size_type const last = RowLastPrintable(row_ptr);
-
- LyXParagraph::size_type vpos;
- LyXParagraph::size_type pos;
-
- float tmpx;
-
- LyXFont font(LyXFont::ALL_SANE);
- int maxdesc;
- if (row_ptr->height() <= 0) {
- lyxerr << "LYX_ERROR: row.height: "
- << row_ptr->height() << endl;
- return;
- }
-
- 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();
-
bool clear_area = true;
Inset * inset = 0;
+ LyXFont font(LyXFont::ALL_SANE);
- if (!bview->screen()->forceClear() && last == row_ptr->pos()
- && row_ptr->par()->GetChar(row_ptr->pos()) == LyXParagraph::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) {
-#ifdef WITH_WARNINGS
-#warning Should be fixed with a lyxinset::clear_width(bv, font) function! (Jug)
-#warning Should we not fix this in the Painter, please have a look Lars! (Jug)
-#endif
- 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->width(bview, font) - 2 : ww;
- int const x = x_offset;
- pain.fillRectangle(x, y, w, h);
- } else if (inset != 0) {
- int h = row_ptr->baseline() - inset->ascent(bview, font);
- if (h > 0) {
- int const w = (inset_owner ?
- inset_owner->width(bview, font) : ww);
- pain.fillRectangle(x_offset, y_offset, w, h);
- }
- h += inset->ascent(bview, font) + inset->descent(bview, font);
- if ((row_ptr->height() - h) > 0) {
- int const w = (inset_owner ?
- inset_owner->width(bview, font) : ww);
- pain.fillRectangle(x_offset, y_offset + h,
- w, row_ptr->height() - h);
- }
- if (!inset_owner && !inset->display() && !inset->needFullRow())
- {
- int const w = inset->width(bview, font) + int(x);
- pain.fillRectangle(w, y_offset, ww - w, row_ptr->height());
+ Paragraph::size_type const last = rowLastPrintable(p.row);
+
+ if (!p.bv->screen()->forceClear() && last == p.row->pos()
+ && isMetaInset(p.row->par(), p.row->pos())) {
+ inset = p.row->par()->getInset(p.row->pos());
+ if (inset) {
+ clear_area = inset->doClearArea();
}
}
+
+ if (p.cleared) {
+ return true;
+ }
- if (selection) {
- int const w = (inset_owner ?
- inset_owner->width(bview, font) : ww);
- // selection code
- if (bidi_same_direction) {
- if (sel_start_cursor.row() == row_ptr &&
- sel_end_cursor.row() == row_ptr) {
- if (sel_start_cursor.x() < sel_end_cursor.x())
- pain.fillRectangle(x_offset + sel_start_cursor.x(),
- y_offset,
- sel_end_cursor.x() - sel_start_cursor.x(),
- row_ptr->height(),
- LColor::selection);
- else
- pain.fillRectangle(x_offset + sel_end_cursor.x(),
- y_offset,
- sel_start_cursor.x() - sel_end_cursor.x(),
- row_ptr->height(),
- LColor::selection);
- } else if (sel_start_cursor.row() == row_ptr) {
- if (is_rtl)
- pain.fillRectangle(x_offset, y_offset,
- sel_start_cursor.x(),
- row_ptr->height(),
- LColor::selection);
- else
- pain.fillRectangle(x_offset + sel_start_cursor.x(),
- y_offset,
- w - sel_start_cursor.x(),
- row_ptr->height(),
- LColor::selection);
- } else if (sel_end_cursor.row() == row_ptr) {
- if (is_rtl)
- pain.fillRectangle(x_offset + sel_end_cursor.x(),
- y_offset,
- w - sel_end_cursor.x(),
- row_ptr->height(),
- LColor::selection);
- else
- pain.fillRectangle(x_offset, y_offset,
- sel_end_cursor.x(),
- row_ptr->height(),
- LColor::selection);
- } else if (y > sel_start_cursor.y()
- && y < sel_end_cursor.y()) {
- pain.fillRectangle(x_offset, y_offset, w,
- row_ptr->height(),
- LColor::selection);
- }
- } else if (sel_start_cursor.row() != row_ptr &&
- sel_end_cursor.row() != row_ptr &&
- y > sel_start_cursor.y()
- && y < sel_end_cursor.y()) {
- pain.fillRectangle(x_offset, y_offset, w,
- row_ptr->height(),
- LColor::selection);
- } else if (sel_start_cursor.row() == row_ptr ||
- sel_end_cursor.row() == row_ptr) {
- float tmpx = x;
- if ((sel_start_cursor.row() != row_ptr && !is_rtl) ||
- (sel_end_cursor.row() != row_ptr && is_rtl))
- pain.fillRectangle(x_offset, y_offset,
- int(tmpx),
- row_ptr->height(),
- LColor::selection);
- LyXParagraph::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,
- GetFont(bview->buffer(),row_ptr->par(), -2));
- 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 ((sel_start_cursor.row() != row_ptr ||
- sel_start_cursor.pos() <= pos) &&
- (sel_end_cursor.row() != row_ptr ||
- pos < sel_end_cursor.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);
- }
+ if (clear_area) {
+ int const x = p.xo;
+ int const y = p.yo < 0 ? 0 : p.yo;
+ int const h = p.yo < 0 ? p.row->height() + p.yo : p.row->height();
+ p.pain->fillRectangle(x, y, p.width, h, backgroundColor());
+ return true;
+ }
+
+ if (inset == 0)
+ return false;
+
+ int h = p.row->baseline() - inset->ascent(p.bv, font);
+
+ // first clear the whole row above the inset!
+ if (h > 0) {
+ p.pain->fillRectangle(p.xo, p.yo, p.width, h, backgroundColor());
+ }
+
+ // clear the space below the inset!
+ h += inset->ascent(p.bv, font) + inset->descent(p.bv, font);
+ if ((p.row->height() - h) > 0) {
+ p.pain->fillRectangle(p.xo, p.yo + h,
+ p.width, p.row->height() - h, backgroundColor());
+ }
- if ((sel_start_cursor.row() != row_ptr && is_rtl) ||
- (sel_end_cursor.row() != row_ptr && !is_rtl) )
- pain.fillRectangle(x_offset + int(tmpx),
- y_offset,
- int(ww - tmpx),
- row_ptr->height(),
- LColor::selection);
+ // clear the space behind the inset, if needed
+ if (!inset->display() && !inset->needFullRow()) {
+ int const xp = int(p.x) + inset->width(p.bv, font);
+ if (p.width - xp > 0) {
+ p.pain->fillRectangle(xp, p.yo, p.width - xp,
+ p.row->height(), backgroundColor());
}
}
+
+ return false;
+}
- int box_x = 0;
-#ifndef NEW_INSETS
- if (row_ptr->par()->footnoteflag == LyXParagraph::OPEN_FOOTNOTE) {
- LyXFont font(LyXFont::ALL_SANE);
- font.setSize(LyXFont::SIZE_FOOTNOTE);
- font.setColor(LColor::footnote);
-
- box_x = LYX_PAPER_MARGIN + lyxfont::width(" wide-tab ", font);
- if (row_ptr->previous() &&
- row_ptr->previous()->par()->footnoteflag != LyXParagraph::OPEN_FOOTNOTE){
- string fs;
- switch (row_ptr->par()->footnotekind) {
- case LyXParagraph::MARGIN:
- fs = " margin";
- break;
- case LyXParagraph::FIG:
- fs = " fig";
- break;
- case LyXParagraph::TAB:
- fs = " tab";
- break;
- case LyXParagraph::WIDE_FIG:
- fs = " wide-fig";
- break;
- case LyXParagraph::WIDE_TAB:
- fs = " wide-tab";
- break;
- case LyXParagraph::ALGORITHM:
- fs = " alg";
- break;
- case LyXParagraph::FOOTNOTE:
- fs = " foot";
- break;
+
+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);
}
-
- pain.fillRectangle(LYX_PAPER_MARGIN,
- y_offset + 1,
- box_x - LYX_PAPER_MARGIN,
- int(lyxfont::maxAscent(font)
- + lyxfont::maxDescent(font)),
- LColor::footnotebg);
-
- pain.line(LYX_PAPER_MARGIN, y_offset,
- workWidth(bview) - LYX_PAPER_MARGIN, y_offset,
- LColor::footnoteframe);
-
- pain.text(LYX_PAPER_MARGIN,
- y_offset + int(lyxfont::maxAscent(font)) + 1,
- fs, font);
-
- pain.line(LYX_PAPER_MARGIN, y_offset,
- LYX_PAPER_MARGIN,
- y_offset + int(lyxfont::maxAscent(font)
- + lyxfont::maxDescent(font)),
- LColor::footnoteframe);
-
- pain.line(LYX_PAPER_MARGIN,
- y_offset + int(lyxfont::maxAscent(font)
- + lyxfont::maxDescent(font)) + 1,
- box_x,
- y_offset + int(lyxfont::maxAscent(font)
- + lyxfont::maxDescent(font)) + 1,
- LColor::footnoteframe);
-
+ } 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();
+ Paragraph::size_type main_body = beginningOfMainBody(buffer, par);
+ Paragraph::size_type const last = rowLastPrintable(row);
+
+ for (Paragraph::size_type vpos = row->pos(); vpos <= last; ++vpos) {
+ Paragraph::size_type pos = vis2log(vpos);
+ float const old_tmpx = tmpx;
+ if (main_body > 0 && pos == main_body - 1) {
+ LyXLayout const & layout = textclasslist.Style(buffer->params.textclass,
+ par->getLayout());
+ 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);
}
- /* draw the open floats in a red box */
- pain.line(box_x, y_offset,
- box_x, y_offset + row_ptr->height(),
- LColor::footnoteframe);
-
- pain.line(workWidth(bview) - LYX_PAPER_MARGIN,
- y_offset,
- workWidth(bview) - LYX_PAPER_MARGIN,
- y_offset + row_ptr->height(),
- LColor::footnoteframe);
-
-
- // Draw appendix lines
- LyXParagraph * p = row_ptr->par()->PreviousBeforeFootnote()->FirstPhysicalPar();
- if (p->params.appendix()) {
- pain.line(1, y_offset,
- 1, y_offset + row_ptr->height(),
- LColor::appendixline);
- pain.line(workWidth(bview) - 2, y_offset,
- workWidth(bview) - 2,
- y_offset + row_ptr->height(),
- LColor::appendixline);
+ 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);
}
-#ifndef NO_PEXTRA
- // Draw minipage line
- bool const minipage =
- (p->params.pextraType() == LyXParagraph::PEXTRA_MINIPAGE);
- if (minipage)
- pain.line(LYX_PAPER_MARGIN/5, y_offset,
- LYX_PAPER_MARGIN/5,
- y_offset + row_ptr->height() - 1,
- LColor::minipageline);
-#endif
- // Draw depth lines
- int const depth = p->GetDepth();
- for (int i = 1; i <= depth; ++i) {
- int const line_x = (LYX_PAPER_MARGIN / 5) *
- (i + minipage);
- pain.line(line_x, y_offset, line_x,
- y_offset + row_ptr->height() - 1,
- LColor::depthbar);
+ 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);
}
- } else if (row_ptr->previous() &&
- row_ptr->previous()->par()->footnoteflag
- == LyXParagraph::OPEN_FOOTNOTE) {
- LyXFont font(LyXFont::ALL_SANE);
- font.setSize(LyXFont::SIZE_FOOTNOTE);
-
- int const box_x = LYX_PAPER_MARGIN
- + lyxfont::width(" wide-tab ", font);
-
- pain.line(box_x, y_offset,
- workWidth(bview) - LYX_PAPER_MARGIN,
- y_offset, LColor::footnote);
- }
-#endif
- // Draw appendix lines
-#ifndef NEW_INSETS
- LyXParagraph * firstpar = row_ptr->par()->FirstPhysicalPar();
-#else
- LyXParagraph * firstpar = row_ptr->par();
-#endif
- 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);
}
-#ifndef NO_PEXTRA
- // Draw minipage line
- bool const minipage =
- (firstpar->params.pextraType() == LyXParagraph::PEXTRA_MINIPAGE);
- if (minipage)
- pain.line(LYX_PAPER_MARGIN/5 + box_x, y_offset,
- LYX_PAPER_MARGIN/5 + box_x,
- y_offset + row_ptr->height() - 1,
- LColor::minipageline);
-#endif
- // Draw depth lines
- int const depth = firstpar->GetDepth();
- if (depth > 0) {
- int next_depth = 0;
- int prev_depth = 0;
- if (row_ptr->next())
-#ifndef NEW_INSETS
- if (row_ptr->par()->footnoteflag ==
- row_ptr->next()->par()->footnoteflag)
- next_depth = row_ptr->next()->par()->GetDepth();
- else if (row_ptr->par()->footnoteflag != LyXParagraph::OPEN_FOOTNOTE)
- next_depth = depth;
-#else
- next_depth = row_ptr->next()->par()->GetDepth();
-#endif
- if (row_ptr->previous())
-#ifndef NEW_INSETS
- if (row_ptr->par()->footnoteflag ==
- row_ptr->previous()->par()->footnoteflag)
- prev_depth = row_ptr->previous()->par()->GetDepth();
- else if (row_ptr->par()->footnoteflag != LyXParagraph::OPEN_FOOTNOTE)
- prev_depth = depth;
-#else
- prev_depth = row_ptr->previous()->par()->GetDepth();
-#endif
+}
+
- for (int i = 1; i <= depth; ++i) {
- int const line_x = (LYX_PAPER_MARGIN / 5) *
- (i
-#ifndef NO_PEXTRA
- + minipage
-#endif
- ) + 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);
- }
+void LyXText::paintRowAppendix(DrawRowParams & p)
+{
+ // FIXME: can be just p.width ?
+ int const ww = p.bv->workWidth();
+ Paragraph * firstpar = p.row->par();
+
+ if (firstpar->params().appendix()) {
+ p.pain->line(1, p.yo, 1, p.yo + p.row->height(), LColor::appendixline);
+ p.pain->line(ww - 2, p.yo, ww - 2, p.yo + p.row->height(), LColor::appendixline);
}
+}
-
- LyXLayout const & layout =
- textclasslist.Style(bview->buffer()->params.textclass,
- row_ptr->par()->GetLayout());
+
+void LyXText::paintRowDepthBar(DrawRowParams & p)
+{
+ Paragraph::depth_type const depth = p.row->par()->getDepth();
+
+ if (depth <= 0)
+ return;
- int y_top = 0;
- int y_bottom = row_ptr->height();
+ 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);
- // 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);
+ int const w = LYX_PAPER_MARGIN / 5;
+
+ if (i > prev_depth) {
+ p.pain->fillRectangle(x, p.yo, w, 2, LColor::depthbar);
}
-
- // 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)
- .rectText(0,
- 0,
- _("Page Break (top)"),
- pb_font,
- LColor::background,
- LColor::background, false, w, a, d);
- pain.rectText((ww - w)/2,
- y_offset + y_top + 2 * DefaultHeight() + d,
- _("Page Break (top)"),
- pb_font,
- LColor::background,
- LColor::background);
- y_top += 3 * DefaultHeight();
+ if (i > next_depth) {
+ p.pain->fillRectangle(x, h, w, 2, LColor::depthbar);
}
+ }
+}
+
+
+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;
- 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 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(0, y, 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 a vfill top
+ if (parparams.spaceTop().kind() == VSpace::VFILL) {
+ int const y1 = p.yo + y_top + 3 * defaultHeight();
+ int const y2 = p.yo + 2 + y_top;
+
+ p.pain->line(0, y1, LYX_PAPER_MARGIN, y1, LColor::vfillline);
- // think about user added space
- y_top += int(row_ptr->par()->params.spaceTop().inPixels(bview));
+ p.pain->line(0, y2, LYX_PAPER_MARGIN, y2, LColor::vfillline);
+
+ int const x = LYX_PAPER_MARGIN / 2;
+
+ p.pain->line(x, y2, x, y1, LColor::vfillline);
- // think about the parskip
- // some parskips VERY EASY IMPLEMENTATION
- if (bview->buffer()->params.paragraph_separation == BufferParams::PARSEP_SKIP) {
+ y_top += 3 * defaultHeight();
+ }
+
+ // think about user added space
+ y_top += int(parparams.spaceTop().inPixels(p.bv));
+
+ Buffer const * buffer = p.bv->buffer();
+
+ LyXLayout const & layout =
+ textclasslist.Style(buffer->params.textclass, par->getLayout());
+
+ // 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
- && 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);
+ && !par->getDepth()) {
+ y_top += buffer->params.getDefSkip().inPixels(p.bv);
+ } else {
+ LyXLayout const & playout =
+ textclasslist.Style(buffer->params.textclass,
+ par->previous()->getLayout());
+ if (playout.latextype == LATEX_PARAGRAPH
+ && !par->previous()->getDepth()) {
+ // is it right to use defskip here, too? (AS)
+ y_top += buffer->params.getDefSkip().inPixels(p.bv);
+ }
+ }
}
+ }
+
+ int const ww = p.bv->workWidth();
+
+ // draw a top line
+ if (parparams.lineTop()) {
+ LyXFont font(LyXFont::ALL_SANE);
+ int const asc = 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<int>(inset_owner ? p.x : 0);
+ p.pain->line(xp, p.yo + y_top, w, p.yo + y_top,
+ LColor::topline, Painter::line_solid,
+ Painter::line_thick);
- 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<int>(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 += 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();
- 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 = GetFont(bview->buffer(), row_ptr->par(), -2);
- 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);
-#ifndef NEW_INSETS
- if (row_ptr->par()->footnoteflag == LyXParagraph::OPEN_FOOTNOTE) {
- LyXFont font(LyXFont::ALL_SANE);
- font.setSize(LyXFont::SIZE_SMALL);
- tmpx += lyxfont::width("Mwide-fixM", font);
- }
-#endif
- } 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);
- }
- }
- // 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 = GetFont(bview->buffer(),
- row_ptr->par(), -2);
- if (!row_ptr->par()->GetLabelstring().empty()) {
- string const tmpstring =
- row_ptr->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.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 = GetFont(bview->buffer(), row_ptr->par(), -1);
- 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);
+ }
+ }
+
+ 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);
}
+ par->bibkey->draw(p.bv, font, p.yo + p.row->baseline(), x, p.cleared);
}
+}
- // is it a last row?
-#ifndef NEW_INSETS
- LyXParagraph * par = row_ptr->par()->LastPhysicalPar();
-#else
- LyXParagraph * par = row_ptr->par();
-#endif
- if (
-#ifndef NEW_INSETS
- row_ptr->par()->ParFromPos(last + 1) == par
-#else
- row_ptr->par() == par
-#endif
- && (!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)
- .rectText(0, 0,
- _("Page Break (bottom)"),
- pb_font,
- LColor::background,
- LColor::background, false, w, a, d);
- pain.rectText((ww - w) / 2, y_place + d,
- _("Page Break (bottom)"),
- pb_font,
- LColor::background,
- LColor::background);
- 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));
+
+void LyXText::paintLastRow(DrawRowParams & p)
+{
+ Paragraph * par = p.row->par();
+ ParagraphParameters const & parparams = par->params();
+ int y_bottom = p.row->height();
+
+ // 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(0, y, ww, 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 a vfill bottom
+ if (parparams.spaceBottom().kind() == VSpace::VFILL) {
+ int const x = LYX_PAPER_MARGIN / 2;
+ int const x2 = LYX_PAPER_MARGIN;
+ int const y = p.yo + y_bottom - 3 * defaultHeight();
+ int const y2 = p.yo + y_bottom - 2;
- if (firstpar->params.lineBottom()) {
- // draw a bottom line
-#ifndef NEW_INSETS
- y_bottom -= lyxfont::ascent('x',
- GetFont(bview->buffer(),
- par,
- par->Last() - 1));
-#else
- y_bottom -= lyxfont::ascent('x',
- GetFont(bview->buffer(),
- par,
- par->size() - 1));
-#endif
- int const w = (inset_owner ?
- inset_owner->width(bview, font) : ww);
- int const xp = static_cast<int>(inset_owner ? x : 0);
- pain.line(xp, y_offset + y_bottom,
- w, y_offset + y_bottom,
- LColor::topline, Painter::line_solid,
- Painter::line_thick);
-#ifndef NEW_INSETS
- y_bottom -= lyxfont::ascent('x',
- GetFont(bview->buffer(),
- par,
- par->Last() - 1));
-#else
- y_bottom -= lyxfont::ascent('x',
- GetFont(bview->buffer(),
- par,
- par->size() - 1));
-#endif
- }
-
- // 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;
-#ifndef NEW_INSETS
- if (row_ptr->par()->footnoteflag == LyXParagraph::OPEN_FOOTNOTE)
- if (is_rtl) {
- LyXFont font(LyXFont::ALL_SANE);
- font.setSize(LyXFont::SIZE_SMALL);
- x += lyxfont::width("Mwide-figM", font);
- } else
- x -= LYX_PAPER_MARGIN/2;
-#endif
- 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 = GetFont(bview->buffer(), row_ptr->par(), -2);
- 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;
- }
- case END_LABEL_NO_LABEL:
- break;
- }
+ p.pain->line(0, y, x2, y, LColor::vfillline);
+ p.pain->line(0, y2, x2, y2, LColor::vfillline);
+ p.pain->line(x, y, x, y2, LColor::vfillline);
+
+ y_bottom -= 3 * defaultHeight();
}
- // draw the text in the pixmap
+ // think about user added space
+ y_bottom -= int(parparams.spaceBottom().inPixels(p.bv));
- vpos = row_ptr->pos();
+ 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(Paragraph::size_type(0), par->size() - 1)));
+
+ y_bottom -= asc;
+
+ int const w = (inset_owner ? inset_owner->width(p.bv, font) : ww);
+ int const xp = static_cast<int>(inset_owner ? p.x : 0);
+ int const y = p.yo + y_bottom;
+ p.pain->line(xp, y, w, y, LColor::topline, Painter::line_solid,
+ Painter::line_thick);
+
+ y_bottom -= asc;
+ }
+
+ Paragraph::size_type const last = rowLastPrintable(p.row);
+ 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 = getFont(buffer, par, last);
+ 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->line(x, y, x, y + size, LColor::eolmarker);
+ p.pain->line(x + size, y, x + size , y + size, LColor::eolmarker);
+ p.pain->line(x, y, x + size, y, LColor::eolmarker);
+ p.pain->line(x, y + size, x + size, y + size, LColor::eolmarker);
+ } else {
+ p.pain->fillRectangle(x, y, size, size, LColor::eolmarker);
+ }
+ break;
+ }
+ case END_LABEL_STATIC:
+ {
+ LyXFont font(LyXFont::ALL_SANE);
+ LyXTextClass::LayoutList::size_type layout = par->getLayout();
+ string const str = textclasslist.
+ Style(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;
+ }
+}
- LyXParagraph::size_type main_body =
- BeginningOfMainBody(bview->buffer(), row_ptr->par());
- if (main_body > 0 &&
- (main_body-1 > last ||
- !row_ptr->par()->IsLineSeparator(main_body - 1)))
+void LyXText::paintRowText(DrawRowParams & p)
+{
+ Paragraph * par = p.row->par();
+ Buffer const * buffer = p.bv->buffer();
+
+ Paragraph::size_type const last = rowLastPrintable(p.row);
+ Paragraph::size_type main_body =
+ beginningOfMainBody(buffer, par);
+ if (main_body > 0 &&
+ (main_body - 1 > last ||
+ !par->isLineSeparator(main_body - 1))) {
main_body = 0;
+ }
- while (vpos <= last) {
- pos = vis2log(vpos);
+ LyXLayout const & layout =
+ textclasslist.Style(buffer->params.textclass, par->getLayout());
+
+ Paragraph::size_type vpos = p.row->pos();
+ while (vpos <= last) {
+ Paragraph::size_type pos = vis2log(vpos);
if (main_body > 0 && pos == main_body - 1) {
- x += fill_label_hfill
- + lyxfont::width(layout.labelsep,
- GetFont(bview->buffer(),
- row_ptr->par(), -2))
- - SingleWidth(bview,
- row_ptr->par(),
- main_body - 1);
+ int const lwidth = lyxfont::width(layout.labelsep,
+ getLabelFont(buffer, par));
+
+ p.x += p.label_hfill + lwidth
+ - singleWidth(p.bv, 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 (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::vfillline);
- if (HfillExpansion(bview->buffer(),
- row_ptr, pos)) {
+ 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,
+ p.pain->line(int(p.x), y2,
+ int(p.x + p.hfill), y2,
LColor::vfillline,
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,
+ p.pain->line(int(p.x), y2,
+ int(p.x + p.label_hfill), y2,
LColor::vfillline,
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::vfillline);
}
- 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.bv, p.row, vpos, p.yo, p.x, p.cleared);
+ }
+ }
+}
+
+
+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
+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
+Paragraph::size_type
+LyXText::getColumnNearX(BufferView * bview, Row * row, int & x,
+ bool & boundary) const
{
float tmpx = 0.0;
- float fill_separator, fill_hfill, fill_label_hfill;
+ float fill_separator;
+ float fill_hfill;
+ float fill_label_hfill;
- PrepareToPrint(bview, row, tmpx, fill_separator,
+ prepareToPrint(bview, row, tmpx, fill_separator,
fill_hfill, fill_label_hfill);
- LyXParagraph::size_type vc = row->pos();
- LyXParagraph::size_type last = RowLastPrintable(row);
- LyXParagraph::size_type c = 0;
+ Paragraph::size_type vc = row->pos();
+ Paragraph::size_type last = rowLastPrintable(row);
+ Paragraph::size_type c = 0;
LyXLayout const & layout =
textclasslist.Style(bview->buffer()->params.textclass,
- row->par()->GetLayout());
+ row->par()->getLayout());
bool left_side = false;
- LyXParagraph::size_type
- main_body = BeginningOfMainBody(bview->buffer(), row->par());
+ Paragraph::size_type
+ main_body = beginningOfMainBody(bview->buffer(), row->par());
float last_tmpx = tmpx;
if (main_body > 0 &&
- (main_body-1 > last ||
- !row->par()->IsLineSeparator(main_body - 1)))
+ (main_body - 1 > last ||
+ !row->par()->isLineSeparator(main_body - 1)))
main_body = 0;
while (vc <= last && tmpx <= x) {
if (main_body > 0 && c == main_body-1) {
tmpx += fill_label_hfill +
lyxfont::width(layout.labelsep,
- GetFont(bview->buffer(), row->par(), -2));
- if (row->par()->IsLineSeparator(main_body - 1))
- tmpx -= SingleWidth(bview, row->par(), main_body-1);
+ getLabelFont(bview->buffer(), row->par()));
+ if (row->par()->isLineSeparator(main_body - 1))
+ tmpx -= singleWidth(bview, row->par(), main_body-1);
}
- if (HfillExpansion(bview->buffer(), row, c)) {
- x += SingleWidth(bview, row->par(), c);
+ if (hfillExpansion(bview->buffer(), row, c)) {
+ x += singleWidth(bview, row->par(), c);
if (c >= main_body)
tmpx += fill_hfill;
else
tmpx += fill_label_hfill;
}
- else if (row->par()->IsSeparator(c)) {
- tmpx += SingleWidth(bview, row->par(), c);
+ else if (row->par()->isSeparator(c)) {
+ tmpx += singleWidth(bview, row->par(), c);
if (c >= main_body)
tmpx+= fill_separator;
} else
- tmpx += SingleWidth(bview, row->par(), c);
+ tmpx += singleWidth(bview, row->par(), c);
++vc;
}
bool const rtl = (bidi_level(c) % 2 == 1);
if (left_side == rtl) {
++c;
- boundary = IsBoundary(bview->buffer(), row->par(), c);
+ boundary = isBoundary(bview->buffer(), row->par(), c);
}
}
if (row->pos() <= last && c > last
- && row->par()->IsNewline(last)) {
+ && row->par()->isNewline(last)) {
if (bidi_level(last) % 2 == 0)
- tmpx -= SingleWidth(bview, row->par(), last);
+ tmpx -= singleWidth(bview, row->par(), last);
else
- tmpx += SingleWidth(bview, row->par(), last);
+ tmpx += singleWidth(bview, row->par(), last);
c = last;
}
}
-#ifndef NEW_INSETS
-/* turn the selection into a new environment. If there is no selection,
-* create an empty environment */
-void LyXText::InsertFootnoteEnvironment(BufferView * bview,
- LyXParagraph::footnote_kind kind)
-{
- /* no footnoteenvironment in a footnoteenvironment */
- if (cursor.par()->footnoteflag != LyXParagraph::NO_FOOTNOTE) {
- WriteAlert(_("Impossible operation"),
- _("You can't insert a float in a float!"),
- _("Sorry."));
- return;
- }
-#ifndef NO_PEXTRA
- /* no marginpars in minipages */
- if (kind == LyXParagraph::MARGIN
- && cursor.par()->params.pextraType() == LyXParagraph::PEXTRA_MINIPAGE) {
- WriteAlert(_("Impossible operation"),
- _("You can't insert a marginpar in a minipage!"),
- _("Sorry."));
- return;
- }
-#endif
- /* this doesnt make sense, if there is no selection */
- bool dummy_selection = false;
- if (!selection) {
- sel_start_cursor = cursor; /* dummy selection */
- sel_end_cursor = cursor;
- dummy_selection = true;
- }
-
- LyXParagraph * tmppar;
-
- /* a test to make sure there is not already a footnote
- * in the selection. */
-
- tmppar = sel_start_cursor.par()->ParFromPos(sel_start_cursor.pos());
-
- while (tmppar != sel_end_cursor.par()->ParFromPos(sel_end_cursor.pos()) &&
- tmppar->footnoteflag == LyXParagraph::NO_FOOTNOTE)
- tmppar = tmppar->next_;
-
- if (tmppar != sel_end_cursor.par()->ParFromPos(sel_end_cursor.pos())
- || tmppar->footnoteflag != LyXParagraph::NO_FOOTNOTE) {
- WriteAlert(_("Impossible operation"),
- _("Float would include float!"),
- _("Sorry."));
- return;
- }
-
- /* ok we have a selection. This is always between sel_start_cursor
- * and sel_end cursor */
-
- SetUndo(bview->buffer(), Undo::FINISH,
- sel_start_cursor.par()->ParFromPos(sel_start_cursor.pos())->previous_,
- sel_end_cursor.par()->ParFromPos(sel_end_cursor.pos())->next_);
-
- if (sel_end_cursor.pos() > 0
- && sel_end_cursor.par()->IsLineSeparator(sel_end_cursor.pos() - 1))
- sel_end_cursor.pos(sel_end_cursor.pos() - 1);
- /* please break before a space at the end */
- if (sel_start_cursor.par() == sel_end_cursor.par()
- && sel_start_cursor.pos() > sel_end_cursor.pos())
- sel_start_cursor.pos(sel_start_cursor.pos() - 1);
-
- sel_end_cursor.par()->BreakParagraphConservative(bview->buffer()->params, sel_end_cursor.pos());
-
- sel_end_cursor.par(sel_end_cursor.par()->next());
- sel_end_cursor.pos(0);
-
- // don't forget to insert a dummy layout paragraph if necessary
- if (sel_start_cursor.par()->GetLayout() != sel_end_cursor.par()->layout){
- sel_end_cursor.par()->BreakParagraphConservative(bview->buffer()->params, 0);
- sel_end_cursor.par()->layout = LYX_DUMMY_LAYOUT;
- sel_end_cursor.par(sel_end_cursor.par()->next_);
- }
- else
- sel_end_cursor.par()->layout = LYX_DUMMY_LAYOUT;
-
- cursor = sel_end_cursor;
-
- /* please break behind a space, if there is one. The space should
- * be erased too */
- if (sel_start_cursor.pos() > 0
- && sel_start_cursor.par()->IsLineSeparator(sel_start_cursor.pos() - 1))
- sel_start_cursor.pos(sel_start_cursor.pos() - 1);
- if (sel_start_cursor.par()->IsLineSeparator(sel_start_cursor.pos())) {
- sel_start_cursor.par()->Erase(sel_start_cursor.pos());
- }
-
- sel_start_cursor.par()->BreakParagraphConservative(bview->buffer()->params,
- sel_start_cursor.pos());
- tmppar = sel_start_cursor.par()->next();
-
- if (dummy_selection) {
- tmppar->Clear();
- if (kind == LyXParagraph::TAB
- || kind == LyXParagraph::FIG
- || kind == LyXParagraph::WIDE_TAB
- || kind == LyXParagraph::WIDE_FIG
- || kind == LyXParagraph::ALGORITHM) {
- pair<bool, LyXTextClass::size_type> lres =
- textclasslist.NumberOfLayout(bview->buffer()->params.textclass,
- "Caption");
- LyXTextClass::size_type lay;
- if (lres.first) {
- // layout fount
- lay = lres.second;
- } else {
- // layout not found
- lay = 0; // use default layout "Standard" (0)
- }
- tmppar->SetLayout(bview->buffer()->params, lay);
- }
- } else {
- if (sel_start_cursor.pos() > 0) {
- /* the footnote-environment should begin with a standard layout.
- * Imagine you insert a footnote within an enumeration, you
- * certainly do not want an enumerated footnote! */
- tmppar->Clear();
- } else {
- /* this is a exception the user would sometimes expect, I hope */
- sel_start_cursor.par()->Clear();
- }
- }
-
- while (tmppar != sel_end_cursor.par()) {
- tmppar->footnoteflag = LyXParagraph::OPEN_FOOTNOTE;
- tmppar->footnotekind = kind;
- tmppar = tmppar->next();
- }
-
- RedoParagraphs(bview, sel_start_cursor, sel_end_cursor.par()->next());
-
- SetCursor(bview, sel_start_cursor.par()->next(), 0);
-
- ClearSelection(bview);
-}
-#endif
-
-
// returns pointer to a specified row
-Row * LyXText::GetRow(LyXParagraph * par,
- LyXParagraph::size_type pos, int & y) const
+Row * LyXText::getRow(Paragraph * par,
+ Paragraph::size_type pos, int & y) const
{
if (!firstrow)
return 0;
projects / lyx.git / blobdiff