int LyXText::SingleWidth(BufferView * bview, LyXParagraph * par,
LyXParagraph::size_type pos, char c) const
{
- LyXFont 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)) {
}
bool const rtl = bidi_level(pos - 1) % 2;
- bool rtl2 = bidi_InRange(pos)
+ bool const rtl2 = bidi_InRange(pos)
? bidi_level(pos) % 2
: par->isRightToLeftPar(buf->params);
return rtl != rtl2;
return false; // This is just for speedup
bool const rtl = font.isVisibleRightToLeft();
- bool rtl2 = bidi_InRange(pos)
+ bool const rtl2 = bidi_InRange(pos)
? bidi_level(pos) % 2
: par->isRightToLeftPar(buf->params);
return rtl != rtl2;
int const wid = lyxfont::width('n', font);
int const asc = lyxfont::maxAscent(font);
int const y = offset + row->baseline();
- int xp[3], yp[3];
+ int xp[3];
+ int yp[3];
if (bidi_level(pos) % 2 == 0) {
xp[0] = int(x + wid * 0.375);
row_ptr->ascent_of_text(maxasc);
- /* is it a top line? */
+ // is it a top line?
if (!row_ptr->pos() && (row_ptr->par() == firstpar)) {
- /* some parksips VERY EASY IMPLEMENTATION */
+ // some parksips VERY EASY IMPLEMENTATION
if (bview->buffer()->params.paragraph_separation ==
BufferParams::PARSEP_SKIP) {
if (layout.isParagraph()
maxasc += bview->buffer()->params.getDefSkip().inPixels(bview);
}
- /* the paper margins */
+ // the paper margins
#ifndef NEW_INSETS
if (!row_ptr->par()->previous_ && bv_owner)
maxasc += LYX_PAPER_MARGIN;
maxasc += LYX_PAPER_MARGIN;
#endif
- /* add the vertical spaces, that the user added */
+ // 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 */
+ // 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 */
+ // 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 */
+ // 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;
spacing_val);
}
- /* special code for the top label */
+ // special code for the top label
if ((layout.labeltype == LABEL_TOP_ENVIRONMENT
|| layout.labeltype == LABEL_BIBLIO
|| layout.labeltype == LABEL_CENTERED_TOP_ENVIRONMENT)
+ 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 (firstpar->previous()
&& firstpar->previous()->GetDepth() == 0
&& firstpar->previous()->GetLayout() != firstpar->GetLayout()) {
- /* avoid parsep */
+ // avoid parsep
}
else if (firstpar->previous()){
maxasc += int(layout.parsep * DefaultHeight());
}
}
- /* is it a bottom line? */
+ // is it a bottom line?
if (
#ifndef NEW_INSETS
row_ptr->par()->ParFromPos(RowLast(row_ptr) + 1) == par
#endif
&& (!row_ptr->next() || row_ptr->next()->par() != row_ptr->par())) {
- /* the paper margins */
+ // the paper margins
#ifndef NEW_INSETS
if (!par->next_ && bv_owner)
maxdesc += LYX_PAPER_MARGIN;
maxdesc += LYX_PAPER_MARGIN;
#endif
- /* add the vertical spaces, that the user added */
+ // 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 */
+ // 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->size() - 1));
#endif
- /* and now the pagebreaks */
+ // 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 */
+ // 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();
}
}
- /* incalculate the layout spaces */
+ // 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 */
+ // calculate the new height of the text
height -= row_ptr->height();
row_ptr->height(maxasc + maxdesc + labeladdon);
bool not_ready = true;
do {
- /* get the next breakpoint */
+ // get the next breakpoint
LyXParagraph::size_type z = NextBreakPoint(bview, row, workWidth(bview));
Row * tmprow = row;
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
else
// set to standard-layout
+#ifndef NEW_INSETS
cursor.par()->next()->SetLayout(bview->buffer()->params, 0);
+#else
+ cursor.par()->next()->SetLayout(0);
+#endif
}
/* if the cursor is at the beginning of a row without prior newline,
void LyXText::GetVisibleRow(BufferView * bview, int y_offset, int x_offset,
Row * row_ptr, int y, bool cleared)
{
- /* returns a printed row */
+ // returns a printed row
Painter & pain = bview->painter();
bool const is_rtl =
LyXParagraph::size_type const last = RowLastPrintable(row_ptr);
- LyXParagraph::size_type vpos, pos;
- float x;
+ LyXParagraph::size_type vpos;
+ LyXParagraph::size_type pos;
+
float tmpx;
- int y_top;
- int y_bottom;
LyXFont font(LyXFont::ALL_SANE);
int maxdesc;
return;
}
+ float x;
float fill_separator;
float fill_hfill;
float fill_label_hfill;
x += x_offset;
// clear the area where we want to paint/print
- int ww = bview->workWidth();
+ int const ww = bview->workWidth();
bool clear_area = true;
Inset * inset = 0;
if (selection) {
int const w = (inset_owner ?
inset_owner->width(bview, font) : ww);
- /* selection code */
+ // selection code
if (bidi_same_direction) {
if (sel_start_cursor.row() == row_ptr &&
sel_end_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
+ // Here we do not use x_offset as x_offset was
// added to x.
pain.fillRectangle(int(old_tmpx),
y_offset,
textclasslist.Style(bview->buffer()->params.textclass,
row_ptr->par()->GetLayout());
- y_top = 0;
- y_bottom = row_ptr->height();
+ int y_top = 0;
+ int y_bottom = row_ptr->height();
- /* is it a first row? */
+ // is it a first row?
if (!row_ptr->pos() && (row_ptr->par() == firstpar)) {
- /* start of appendix? */
+ // start of appendix?
if (row_ptr->par()->params.startOfAppendix()) {
pain.line(1, y_offset,
ww - 2, y_offset,
LColor::appendixline);
}
- /* think about the margins */
+ // think about the margins
if (!row_ptr->previous() && bv_owner)
y_top += LYX_PAPER_MARGIN;
- /* draw a top pagebreak */
+ // draw a top pagebreak
if (row_ptr->par()->params.pagebreakTop()) {
LyXFont pb_font;
pb_font.setColor(LColor::pagebreak).decSize();
- int w = 0, a = 0, d = 0;
+ 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(),
}
if (row_ptr->par()->params.spaceTop().kind() == VSpace::VFILL) {
- /* draw a vfill top */
+ // draw a vfill top
pain.line(0, y_offset + 2 + y_top,
LYX_PAPER_MARGIN, y_offset + 2 + y_top,
LColor::vfillline);
y_top += 3 * DefaultHeight();
}
- /* think about user added space */
+ // think about user added space
y_top += int(row_ptr->par()->params.spaceTop().inPixels(bview));
- /* think about the parskip */
- /* some parskips VERY EASY IMPLEMENTATION */
+ // think about the parskip
+ // some parskips VERY EASY IMPLEMENTATION
if (bview->buffer()->params.paragraph_separation == BufferParams::PARSEP_SKIP) {
if (layout.latextype == LATEX_PARAGRAPH
&& firstpar->GetDepth() == 0
y_top += bview->buffer()->params.getDefSkip().inPixels(bview);
}
- if (row_ptr->par()->params.lineTop()) { /* draw a top line */
+ if (row_ptr->par()->params.lineTop()) {
+ // draw a top line
y_top += lyxfont::ascent('x',
GetFont(bview->buffer(),
row_ptr->par(), 0));
row_ptr->par(), 0));
}
- /* should we print a label? */
+ // should we print a label?
if (layout.labeltype >= LABEL_STATIC
&& (layout.labeltype != LABEL_STATIC
|| layout.latextype != LATEX_ENVIRONMENT
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. */
+ // 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();
tmpx = x - lyxfont::width(layout.labelsep, font)
- lyxfont::width(tmpstring, font);
- /* draw it! */
+ // 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 */
+ // 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) {
}
}
- /* is it a last row? */
+ // is it a last row?
#ifndef NEW_INSETS
LyXParagraph * par = row_ptr->par()->LastPhysicalPar();
#else
#endif
&& (!row_ptr->next() || row_ptr->next()->par() != row_ptr->par()))
{
- /* think about the margins */
+ // think about the margins
if (!row_ptr->next() && bv_owner)
y_bottom -= LYX_PAPER_MARGIN;
- /* draw a bottom pagebreak */
+ // draw a bottom pagebreak
if (firstpar->params.pagebreakBottom()) {
LyXFont pb_font;
pb_font.setColor(LColor::pagebreak).decSize();
- int w = 0, a = 0, d = 0;
- pain.line(0,
- y_offset + y_bottom - 2 * DefaultHeight(),
- ww,
- y_offset + y_bottom - 2 * DefaultHeight(),
- LColor::pagebreak,
- Painter::line_onoffdash)
- .rectText(0,
- 0,
+ 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_offset + y_top + 2 * DefaultHeight() + d,
+ pain.rectText((ww - w) / 2, y_place + d,
_("Page Break (bottom)"),
pb_font,
LColor::background,
}
if (firstpar->params.spaceBottom().kind() == VSpace::VFILL) {
- /* draw a vfill bottom */
- pain.line(0, y_offset + y_bottom - 3 * DefaultHeight(),
- LYX_PAPER_MARGIN,
- y_offset + y_bottom - 3 * DefaultHeight(),
+ // 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_offset + y_bottom - 3 * DefaultHeight(),
+ y_place,
LYX_PAPER_MARGIN / 2,
y_offset + y_bottom - 2,
LColor::vfillline);
y_bottom -= 3 * DefaultHeight();
}
- /* think about user added space */
+ // think about user added space
y_bottom -= int(firstpar->params.spaceBottom().inPixels(bview));
if (firstpar->params.lineBottom()) {
- /* draw a bottom line */
+ // draw a bottom line
#ifndef NEW_INSETS
y_bottom -= lyxfont::ascent('x',
GetFont(bview->buffer(),
}
}
- /* draw the text in the pixmap */
+ // draw the text in the pixmap
vpos = row_ptr->pos();
{
if (!firstrow)
return 0;
-
+
Row * tmprow = firstrow;
y = 0;
projects / features.git / commitdiff