From 97a59984b15c48db0caae7db1245750a93559984 Mon Sep 17 00:00:00 2001 From: Abdelrazak Younes Date: Mon, 1 Jan 2007 09:36:55 +0000 Subject: [PATCH] Transfer these methods from LyXText to TextMetrics: - labelEnd() - rowBreakPoint() - setRowWidth() - setHeightOfRow() git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16451 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/TextMetrics.C | 388 ++++++++++++++++++++++++++++++++++++++++++++-- src/TextMetrics.h | 23 +++ src/lyxtext.h | 18 --- src/text.C | 370 ------------------------------------------- 4 files changed, 402 insertions(+), 397 deletions(-) diff --git a/src/TextMetrics.C b/src/TextMetrics.C index 64284be6ab..4a382f20d5 100644 --- a/src/TextMetrics.C +++ b/src/TextMetrics.C @@ -22,6 +22,7 @@ #include "buffer.h" #include "bufferparams.h" #include "BufferView.h" +#include "paragraph_funcs.h" #include "pariterator.h" #include "coordcache.h" #include "debug.h" @@ -83,18 +84,16 @@ int numberOfLabelHfills(Paragraph const & par, Row const & row) int numberOfHfills(Paragraph const & par, Row const & row) { - pos_type last = row.endpos(); + pos_type const last = row.endpos(); pos_type first = row.pos(); - pos_type const par_size = par.size(); // hfill *DO* count at the beginning of paragraphs! if (first) { - while (first < last && first < par_size && par.isHfill(first)) + while (first < last && par.isHfill(first)) ++first; } first = max(first, par.beginOfBody()); - last = min(last, par_size); int n = 0; for (pos_type p = first; p < last; ++p) { @@ -220,11 +219,13 @@ bool TextMetrics::redoParagraph(pit_type const pit) par.setBeginOfBody(); pos_type z = 0; + // maximum pixel width of a row + int width = max_width_ - right_margin; // - leftMargin(buffer, max_width_, pit, row); do { Row row(z); - text_->rowBreakPoint(buffer, right_margin, max_width_, pit, row); - text_->setRowWidth(buffer, right_margin, max_width_, pit, row); - text_->setHeightOfRow(*bv_, pit, row); + rowBreakPoint(width, pit, row); + setRowWidth(right_margin, pit, row); + setHeightOfRow(pit, row); pm.rows().push_back(row); pm.dim().wid = std::max(pm.dim().wid, row.width()); pm.dim().des += row.height(); @@ -239,8 +240,8 @@ bool TextMetrics::redoParagraph(pit_type const pit) if (z > 0 && par.isNewline(z - 1)) { Row row(z - 1); row.endpos(z - 1); - text_->setRowWidth(buffer, right_margin, max_width_, pit, row); - text_->setHeightOfRow(*bv_, pit, row); + setRowWidth(right_margin, pit, row); + setHeightOfRow(pit, row); pm.rows().push_back(row); pm.dim().des += row.height(); } @@ -403,6 +404,375 @@ int TextMetrics::labelFill(Paragraph const & par, Row const & row) const } +namespace { + +// this needs special handling - only newlines count as a break point +pos_type addressBreakPoint(pos_type i, Paragraph const & par) +{ + pos_type const end = par.size(); + + for (; i < end; ++i) + if (par.isNewline(i)) + return i + 1; + + return end; +} + +}; + + +int TextMetrics::labelEnd(pit_type const pit) const +{ + // labelEnd is only needed if the layout fills a flushleft label. + if (text_->getPar(pit).layout()->margintype != MARGIN_MANUAL) + return 0; + // return the beginning of the body + return text_->leftMargin(*bv_->buffer(), max_width_, pit); +} + + +void TextMetrics::rowBreakPoint(int width, pit_type const pit, + Row & row) const +{ + Buffer & buffer = *bv_->buffer(); + Paragraph const & par = text_->getPar(pit); + pos_type const end = par.size(); + pos_type const pos = row.pos(); + if (pos == end) { + row.endpos(end); + return; + } + + if (width < 0) { + row.endpos(end); + return; + } + + LyXLayout_ptr const & layout = par.layout(); + + if (layout->margintype == MARGIN_RIGHT_ADDRESS_BOX) { + row.endpos(addressBreakPoint(pos, par)); + return; + } + + pos_type const body_pos = par.beginOfBody(); + + + // Now we iterate through until we reach the right margin + // or the end of the par, then choose the possible break + // nearest that. + + int label_end = labelEnd(pit); + int const left = text_->leftMargin(buffer, max_width_, pit, pos); + int x = left; + + // pixel width since last breakpoint + int chunkwidth = 0; + + FontIterator fi = FontIterator(buffer, *text_, par, pos); + pos_type point = end; + pos_type i = pos; + FontMetrics const & fm = theFontMetrics(text_->getLabelFont(buffer, par)); + for ( ; i < end; ++i, ++fi) { + char_type const c = par.getChar(i); + int thiswidth = text_->singleWidth(par, i, c, *fi); + + // add the auto-hfill from label end to the body + if (body_pos && i == body_pos) { + docstring lsep = from_utf8(layout->labelsep); + int add = fm.width(lsep); + if (par.isLineSeparator(i - 1)) + add -= text_->singleWidth(buffer, par, i - 1); + + add = std::max(add, label_end - x); + thiswidth += add; + } + + x += thiswidth; + chunkwidth += thiswidth; + + // break before a character that will fall off + // the right of the row + if (x >= width) { + // if no break before, break here + if (point == end || chunkwidth >= width - left) { + if (i > pos) + point = i; + else + point = i + 1; + + } + // exit on last registered breakpoint: + break; + } + + if (par.isNewline(i)) { + point = i + 1; + break; + } + // Break before... + if (i + 1 < end) { + if (par.isInset(i + 1) && par.getInset(i + 1)->display()) { + point = i + 1; + break; + } + // ...and after. + if (par.isInset(i) && par.getInset(i)->display()) { + point = i + 1; + break; + } + } + + if (!par.isInset(i) || par.getInset(i)->isChar()) { + // some insets are line separators too + if (par.isLineSeparator(i)) { + // register breakpoint: + point = i + 1; + chunkwidth = 0; + } + } + } + + // maybe found one, but the par is short enough. + if (i == end && x < width) + point = end; + + // manual labels cannot be broken in LaTeX. But we + // want to make our on-screen rendering of footnotes + // etc. still break + if (body_pos && point < body_pos) + point = body_pos; + + row.endpos(point); +} + + +void TextMetrics::setRowWidth(int right_margin, + pit_type const pit, Row & row) const +{ + Buffer & buffer = *bv_->buffer(); + // get the pure distance + pos_type const end = row.endpos(); + + Paragraph const & par = text_->getPar(pit); + docstring const labelsep = from_utf8(par.layout()->labelsep); + int w = text_->leftMargin(buffer, max_width_, pit, row.pos()); + int label_end = labelEnd(pit); + + pos_type const body_pos = par.beginOfBody(); + pos_type i = row.pos(); + + FontMetrics const & fm = theFontMetrics(text_->getLabelFont(buffer, par)); + + if (i < end) { + FontIterator fi = FontIterator(buffer, *text_, par, i); + for ( ; i < end; ++i, ++fi) { + if (body_pos > 0 && i == body_pos) { + w += fm.width(labelsep); + if (par.isLineSeparator(i - 1)) + w -= text_->singleWidth(buffer, par, i - 1); + w = max(w, label_end); + } + char_type const c = par.getChar(i); + w += text_->singleWidth(par, i, c, *fi); + } + } + + if (body_pos > 0 && body_pos >= end) { + w += fm.width(labelsep); + if (end > 0 && par.isLineSeparator(end - 1)) + w -= text_->singleWidth(buffer, par, end - 1); + w = max(w, label_end); + } + + row.width(w + right_margin); +} + + +void TextMetrics::setHeightOfRow(pit_type const pit, + Row & row) +{ + Paragraph const & par = text_->getPar(pit); + // get the maximum ascent and the maximum descent + double layoutasc = 0; + double layoutdesc = 0; + double const dh = defaultRowHeight(); + + // ok, let us initialize the maxasc and maxdesc value. + // Only the fontsize count. The other properties + // are taken from the layoutfont. Nicer on the screen :) + LyXLayout_ptr const & layout = par.layout(); + + // as max get the first character of this row then it can + // increase but not decrease the height. Just some point to + // start with so we don't have to do the assignment below too + // often. + Buffer const & buffer = *bv_->buffer(); + LyXFont font = text_->getFont(buffer, par, row.pos()); + LyXFont::FONT_SIZE const tmpsize = font.size(); + font = text_->getLayoutFont(buffer, pit); + LyXFont::FONT_SIZE const size = font.size(); + font.setSize(tmpsize); + + LyXFont labelfont = text_->getLabelFont(buffer, par); + + FontMetrics const & labelfont_metrics = theFontMetrics(labelfont); + FontMetrics const & fontmetrics = theFontMetrics(font); + + // these are minimum values + double const spacing_val = layout->spacing.getValue() + * text_->spacing(buffer, par); + //lyxerr << "spacing_val = " << spacing_val << endl; + int maxasc = int(fontmetrics.maxAscent() * spacing_val); + int maxdesc = int(fontmetrics.maxDescent() * spacing_val); + + // insets may be taller + InsetList::const_iterator ii = par.insetlist.begin(); + InsetList::const_iterator iend = par.insetlist.end(); + for ( ; ii != iend; ++ii) { + if (ii->pos >= row.pos() && ii->pos < row.endpos()) { + maxasc = max(maxasc, ii->inset->ascent()); + maxdesc = max(maxdesc, ii->inset->descent()); + } + } + + // Check if any custom fonts are larger (Asger) + // This is not completely correct, but we can live with the small, + // cosmetic error for now. + int labeladdon = 0; + pos_type const pos_end = row.endpos(); + + LyXFont::FONT_SIZE maxsize = + par.highestFontInRange(row.pos(), pos_end, size); + if (maxsize > font.size()) { + font.setSize(maxsize); + maxasc = max(maxasc, fontmetrics.maxAscent()); + maxdesc = max(maxdesc, fontmetrics.maxDescent()); + } + + // This is nicer with box insets: + ++maxasc; + ++maxdesc; + + row.ascent(maxasc); + ParagraphList const & pars = text_->paragraphs(); + + // is it a top line? + if (row.pos() == 0) { + BufferParams const & bufparams = buffer.params(); + // some parksips VERY EASY IMPLEMENTATION + if (bufparams.paragraph_separation + == BufferParams::PARSEP_SKIP + && pit > 0 + && ((layout->isParagraph() && par.getDepth() == 0) + || (pars[pit - 1].layout()->isParagraph() + && pars[pit - 1].getDepth() == 0))) + { + maxasc += bufparams.getDefSkip().inPixels(*bv_); + } + + if (par.params().startOfAppendix()) + maxasc += int(3 * dh); + + // This is special code for the chapter, since the label of this + // layout is printed in an extra row + if (layout->counter == "chapter" + && !par.params().labelString().empty()) { + labeladdon = int(labelfont_metrics.maxHeight() + * layout->spacing.getValue() + * text_->spacing(buffer, par)); + } + + // special code for the top label + if ((layout->labeltype == LABEL_TOP_ENVIRONMENT + || layout->labeltype == LABEL_BIBLIO + || layout->labeltype == LABEL_CENTERED_TOP_ENVIRONMENT) + && isFirstInSequence(pit, pars) + && !par.getLabelstring().empty()) + { + labeladdon = int( + labelfont_metrics.maxHeight() + * layout->spacing.getValue() + * text_->spacing(buffer, par) + + (layout->topsep + layout->labelbottomsep) * dh); + } + + // Add the layout spaces, for example before and after + // a section, or between the items of a itemize or enumerate + // environment. + + pit_type prev = depthHook(pit, pars, par.getDepth()); + if (prev != pit + && pars[prev].layout() == layout + && pars[prev].getDepth() == par.getDepth() + && pars[prev].getLabelWidthString() == par.getLabelWidthString()) + { + layoutasc = layout->itemsep * dh; + } else if (pit != 0 || row.pos() != 0) { + if (layout->topsep > 0) + layoutasc = layout->topsep * dh; + } + + prev = outerHook(pit, pars); + if (prev != pit_type(pars.size())) { + maxasc += int(pars[prev].layout()->parsep * dh); + } else if (pit != 0) { + if (pars[pit - 1].getDepth() != 0 || + pars[pit - 1].layout() == layout) { + maxasc += int(layout->parsep * dh); + } + } + } + + // is it a bottom line? + if (row.endpos() >= par.size()) { + // add the layout spaces, for example before and after + // a section, or between the items of a itemize or enumerate + // environment + pit_type nextpit = pit + 1; + if (nextpit != pit_type(pars.size())) { + pit_type cpit = pit; + double usual = 0; + double unusual = 0; + + if (pars[cpit].getDepth() > pars[nextpit].getDepth()) { + usual = pars[cpit].layout()->bottomsep * dh; + cpit = depthHook(cpit, pars, pars[nextpit].getDepth()); + if (pars[cpit].layout() != pars[nextpit].layout() + || pars[nextpit].getLabelWidthString() != pars[cpit].getLabelWidthString()) + { + unusual = pars[cpit].layout()->bottomsep * dh; + } + layoutdesc = max(unusual, usual); + } else if (pars[cpit].getDepth() == pars[nextpit].getDepth()) { + if (pars[cpit].layout() != pars[nextpit].layout() + || pars[nextpit].getLabelWidthString() != pars[cpit].getLabelWidthString()) + layoutdesc = int(pars[cpit].layout()->bottomsep * dh); + } + } + } + + // incalculate the layout spaces + maxasc += int(layoutasc * 2 / (2 + pars[pit].getDepth())); + maxdesc += int(layoutdesc * 2 / (2 + pars[pit].getDepth())); + + // FIXME: the correct way is to do the following is to move the + // following code in another method specially tailored for the + // main LyXText. The following test is thus bogus. + // Top and bottom margin of the document (only at top-level) + if (main_text_) { + if (pit == 0 && row.pos() == 0) + maxasc += 20; + if (pit + 1 == pit_type(pars.size()) && + row.endpos() == par.size()) + maxdesc += 20; + } + + row.ascent(maxasc + labeladdon); + row.descent(maxdesc); +} + + int defaultRowHeight() { return int(theFontMetrics(LyXFont(LyXFont::ALL_SANE)).maxHeight() * 1.2); diff --git a/src/TextMetrics.h b/src/TextMetrics.h index 3b17761a73..61b27c8399 100644 --- a/src/TextMetrics.h +++ b/src/TextMetrics.h @@ -77,6 +77,19 @@ private: /// the minimum space a manual label needs on the screen in pixels int labelFill(Paragraph const & par, Row const & row) const; + /// FIXME?? + int labelEnd(pit_type const pit) const; + + /// sets row.end to the pos value *after* which a row should break. + /// for example, the pos after which isNewLine(pos) == true + void rowBreakPoint(int width, pit_type const pit, Row & row) const; + + /// sets row.width to the minimum space a row needs on the screen in pixel + void setRowWidth(int right_margin, pit_type const pit, Row & row) const; + + /// Calculate and set the height of the row + void setHeightOfRow(pit_type, Row & row); + /// The BufferView owner. BufferView * bv_; @@ -91,6 +104,16 @@ private: mutable ParMetricsCache par_metrics_; Dimension dim_; int max_width_; + + /// FIXME: transfer this code in CoordCache here. + /* + /// A map from paragraph index number to screen point + typedef std::map InnerParPosCache; + /// A map from a LyXText to the map of paragraphs to screen points + typedef std::map ParPosCache; + /// Paragraph grouped by owning text + ParPosCache pars_; + */ }; /// return the default height of a row in pixels, considering font zoom diff --git a/src/lyxtext.h b/src/lyxtext.h index a01fb2ea72..f43169b1ec 100644 --- a/src/lyxtext.h +++ b/src/lyxtext.h @@ -356,20 +356,6 @@ public: bool deleteEmptyParagraphMechanism(LCursor & cur, LCursor & old, bool & need_anchor_change); - /// sets row.end to the pos value *after* which a row should break. - /// for example, the pos after which isNewLine(pos) == true - /// FIXME: move to TextMetrics. - void rowBreakPoint(Buffer const &, int right_margin, int max_width, pit_type pit, - Row & row) const; - /// sets row.width to the minimum space a row needs on the screen in pixel - /// FIXME: move to TextMetrics. - void setRowWidth(Buffer const &, int right_margin, int max_width, pit_type pit, - Row & row) const; - - /// Calculate and set the height of the row - /// FIXME: move to TextMetrics. - void setHeightOfRow(BufferView const &, pit_type, Row & row); - public: /// the current font settings LyXFont current_font; @@ -408,10 +394,6 @@ private: void deleteWordBackward(LCursor & cur); /// void deleteLineForward(LCursor & cur); - - /// FIXME - int labelEnd(Buffer const &, int max_width, pit_type pit) const; - /// void charInserted(); /// set 'number' font property diff --git a/src/text.C b/src/text.C index 8118d47f7e..fc1b239e1c 100644 --- a/src/text.C +++ b/src/text.C @@ -579,382 +579,12 @@ int LyXText::leftMargin(Buffer const & buffer, int max_width, } -int LyXText::labelEnd(Buffer const & buffer, int max_width, pit_type const pit) const -{ - // labelEnd is only needed if the layout fills a flushleft label. - if (pars_[pit].layout()->margintype != MARGIN_MANUAL) - return 0; - // return the beginning of the body - return leftMargin(buffer, max_width, pit); -} - - -namespace { - -// this needs special handling - only newlines count as a break point -pos_type addressBreakPoint(pos_type i, Paragraph const & par) -{ - pos_type const end = par.size(); - - for (; i < end; ++i) - if (par.isNewline(i)) - return i + 1; - - return end; -} - -}; - - -void LyXText::rowBreakPoint(Buffer const & buffer, int right_margin, - int max_width, pit_type const pit, Row & row) const -{ - Paragraph const & par = pars_[pit]; - pos_type const end = par.size(); - pos_type const pos = row.pos(); - if (pos == end) { - row.endpos(end); - return; - } - - // maximum pixel width of a row - int width = max_width - right_margin; // - leftMargin(buffer, max_width, pit, row); - if (width < 0) { - row.endpos(end); - return; - } - - LyXLayout_ptr const & layout = par.layout(); - - if (layout->margintype == MARGIN_RIGHT_ADDRESS_BOX) { - row.endpos(addressBreakPoint(pos, par)); - return; - } - - pos_type const body_pos = par.beginOfBody(); - - - // Now we iterate through until we reach the right margin - // or the end of the par, then choose the possible break - // nearest that. - - int label_end = labelEnd(buffer, max_width, pit); - int const left = leftMargin(buffer, max_width, pit, pos); - int x = left; - - // pixel width since last breakpoint - int chunkwidth = 0; - - FontIterator fi = FontIterator(buffer, *this, par, pos); - pos_type point = end; - pos_type i = pos; - FontMetrics const & fm = theFontMetrics(getLabelFont(buffer, par)); - for ( ; i < end; ++i, ++fi) { - char_type const c = par.getChar(i); - int thiswidth = singleWidth(par, i, c, *fi); - - // add the auto-hfill from label end to the body - if (body_pos && i == body_pos) { - docstring lsep = from_utf8(layout->labelsep); - int add = fm.width(lsep); - if (par.isLineSeparator(i - 1)) - add -= singleWidth(buffer, par, i - 1); - - add = std::max(add, label_end - x); - thiswidth += add; - } - - x += thiswidth; - chunkwidth += thiswidth; - - // break before a character that will fall off - // the right of the row - if (x >= width) { - // if no break before, break here - if (point == end || chunkwidth >= width - left) { - if (i > pos) - point = i; - else - point = i + 1; - - } - // exit on last registered breakpoint: - break; - } - - if (par.isNewline(i)) { - point = i + 1; - break; - } - // Break before... - if (i + 1 < end) { - if (par.isInset(i + 1) && par.getInset(i + 1)->display()) { - point = i + 1; - break; - } - // ...and after. - if (par.isInset(i) && par.getInset(i)->display()) { - point = i + 1; - break; - } - } - - if (!par.isInset(i) || par.getInset(i)->isChar()) { - // some insets are line separators too - if (par.isLineSeparator(i)) { - // register breakpoint: - point = i + 1; - chunkwidth = 0; - } - } - } - - // maybe found one, but the par is short enough. - if (i == end && x < width) - point = end; - - // manual labels cannot be broken in LaTeX. But we - // want to make our on-screen rendering of footnotes - // etc. still break - if (body_pos && point < body_pos) - point = body_pos; - - row.endpos(point); -} - - -void LyXText::setRowWidth(Buffer const & buffer, int right_margin, - int max_width, pit_type const pit, Row & row) const -{ - // get the pure distance - pos_type const end = row.endpos(); - - Paragraph const & par = pars_[pit]; - docstring const labelsep = from_utf8(par.layout()->labelsep); - int w = leftMargin(buffer, max_width, pit, row.pos()); - int label_end = labelEnd(buffer, max_width, pit); - - pos_type const body_pos = par.beginOfBody(); - pos_type i = row.pos(); - - FontMetrics const & fm = theFontMetrics(getLabelFont(buffer, par)); - - if (i < end) { - FontIterator fi = FontIterator(buffer, *this, par, i); - for ( ; i < end; ++i, ++fi) { - if (body_pos > 0 && i == body_pos) { - w += fm.width(labelsep); - if (par.isLineSeparator(i - 1)) - w -= singleWidth(buffer, par, i - 1); - w = max(w, label_end); - } - char_type const c = par.getChar(i); - w += singleWidth(par, i, c, *fi); - } - } - - if (body_pos > 0 && body_pos >= end) { - w += fm.width(labelsep); - if (end > 0 && par.isLineSeparator(end - 1)) - w -= singleWidth(buffer, par, end - 1); - w = max(w, label_end); - } - - row.width(w + right_margin); -} - - LColor_color LyXText::backgroundColor() const { return LColor_color(LColor::color(background_color_)); } -void LyXText::setHeightOfRow(BufferView const & bv, pit_type const pit, - Row & row) -{ - Paragraph const & par = pars_[pit]; - // get the maximum ascent and the maximum descent - double layoutasc = 0; - double layoutdesc = 0; - double const dh = defaultRowHeight(); - - // ok, let us initialize the maxasc and maxdesc value. - // Only the fontsize count. The other properties - // are taken from the layoutfont. Nicer on the screen :) - LyXLayout_ptr const & layout = par.layout(); - - // as max get the first character of this row then it can - // increase but not decrease the height. Just some point to - // start with so we don't have to do the assignment below too - // often. - Buffer const & buffer = *bv.buffer(); - LyXFont font = getFont(buffer, par, row.pos()); - LyXFont::FONT_SIZE const tmpsize = font.size(); - font = getLayoutFont(buffer, pit); - LyXFont::FONT_SIZE const size = font.size(); - font.setSize(tmpsize); - - LyXFont labelfont = getLabelFont(buffer, par); - - FontMetrics const & labelfont_metrics = theFontMetrics(labelfont); - FontMetrics const & fontmetrics = theFontMetrics(font); - - // these are minimum values - double const spacing_val = layout->spacing.getValue() - * spacing(*bv.buffer(), par); - //lyxerr << "spacing_val = " << spacing_val << endl; - int maxasc = int(fontmetrics.maxAscent() * spacing_val); - int maxdesc = int(fontmetrics.maxDescent() * spacing_val); - - // insets may be taller - InsetList::const_iterator ii = par.insetlist.begin(); - InsetList::const_iterator iend = par.insetlist.end(); - for ( ; ii != iend; ++ii) { - if (ii->pos >= row.pos() && ii->pos < row.endpos()) { - maxasc = max(maxasc, ii->inset->ascent()); - maxdesc = max(maxdesc, ii->inset->descent()); - } - } - - // Check if any custom fonts are larger (Asger) - // This is not completely correct, but we can live with the small, - // cosmetic error for now. - int labeladdon = 0; - pos_type const pos_end = row.endpos(); - - LyXFont::FONT_SIZE maxsize = - par.highestFontInRange(row.pos(), pos_end, size); - if (maxsize > font.size()) { - font.setSize(maxsize); - maxasc = max(maxasc, fontmetrics.maxAscent()); - maxdesc = max(maxdesc, fontmetrics.maxDescent()); - } - - // This is nicer with box insets: - ++maxasc; - ++maxdesc; - - row.ascent(maxasc); - - // is it a top line? - if (row.pos() == 0) { - Buffer const & buffer = *bv.buffer(); - BufferParams const & bufparams = buffer.params(); - // some parksips VERY EASY IMPLEMENTATION - if (bufparams.paragraph_separation - == BufferParams::PARSEP_SKIP - && pit != 0 - && ((layout->isParagraph() && par.getDepth() == 0) - || (pars_[pit - 1].layout()->isParagraph() - && pars_[pit - 1].getDepth() == 0))) - { - maxasc += bufparams.getDefSkip().inPixels(bv); - } - - if (par.params().startOfAppendix()) - maxasc += int(3 * dh); - - // This is special code for the chapter, since the label of this - // layout is printed in an extra row - if (layout->counter == "chapter" - && !par.params().labelString().empty()) { - labeladdon = int(labelfont_metrics.maxHeight() - * layout->spacing.getValue() - * spacing(buffer, par)); - } - - // special code for the top label - if ((layout->labeltype == LABEL_TOP_ENVIRONMENT - || layout->labeltype == LABEL_BIBLIO - || layout->labeltype == LABEL_CENTERED_TOP_ENVIRONMENT) - && isFirstInSequence(pit, paragraphs()) - && !par.getLabelstring().empty()) - { - labeladdon = int( - labelfont_metrics.maxHeight() - * layout->spacing.getValue() - * spacing(*bv.buffer(), par) - + (layout->topsep + layout->labelbottomsep) * dh); - } - - // Add the layout spaces, for example before and after - // a section, or between the items of a itemize or enumerate - // environment. - - pit_type prev = depthHook(pit, pars_, par.getDepth()); - if (prev != pit - && pars_[prev].layout() == layout - && pars_[prev].getDepth() == par.getDepth() - && pars_[prev].getLabelWidthString() == par.getLabelWidthString()) - { - layoutasc = layout->itemsep * dh; - } else if (pit != 0 || row.pos() != 0) { - if (layout->topsep > 0) - layoutasc = layout->topsep * dh; - } - - prev = outerHook(pit, pars_); - if (prev != pit_type(pars_.size())) { - maxasc += int(pars_[prev].layout()->parsep * dh); - } else if (pit != 0) { - if (pars_[pit - 1].getDepth() != 0 || - pars_[pit - 1].layout() == layout) { - maxasc += int(layout->parsep * dh); - } - } - } - - // is it a bottom line? - if (row.endpos() >= par.size()) { - // add the layout spaces, for example before and after - // a section, or between the items of a itemize or enumerate - // environment - pit_type nextpit = pit + 1; - if (nextpit != pit_type(pars_.size())) { - pit_type cpit = pit; - double usual = 0; - double unusual = 0; - - if (pars_[cpit].getDepth() > pars_[nextpit].getDepth()) { - usual = pars_[cpit].layout()->bottomsep * dh; - cpit = depthHook(cpit, paragraphs(), pars_[nextpit].getDepth()); - if (pars_[cpit].layout() != pars_[nextpit].layout() - || pars_[nextpit].getLabelWidthString() != pars_[cpit].getLabelWidthString()) - { - unusual = pars_[cpit].layout()->bottomsep * dh; - } - layoutdesc = max(unusual, usual); - } else if (pars_[cpit].getDepth() == pars_[nextpit].getDepth()) { - if (pars_[cpit].layout() != pars_[nextpit].layout() - || pars_[nextpit].getLabelWidthString() != pars_[cpit].getLabelWidthString()) - layoutdesc = int(pars_[cpit].layout()->bottomsep * dh); - } - } - } - - // incalculate the layout spaces - maxasc += int(layoutasc * 2 / (2 + pars_[pit].getDepth())); - maxdesc += int(layoutdesc * 2 / (2 + pars_[pit].getDepth())); - - // FIXME: the correct way is to do the following is to move the - // following code in another method specially tailored for the - // main LyXText. The following test is thus bogus. - LyXText const & text = buffer.text(); - // Top and bottom margin of the document (only at top-level) - if (&text == this) { - if (pit == 0 && row.pos() == 0) - maxasc += 20; - if (pit + 1 == pit_type(pars_.size()) && - row.endpos() == par.size()) - maxdesc += 20; - } - - row.ascent(maxasc + labeladdon); - row.descent(maxdesc); -} - - void LyXText::breakParagraph(LCursor & cur, bool keep_layout) { BOOST_ASSERT(this == cur.text()); -- 2.39.2