#include "support/debug.h"
#include "support/lassert.h"
#include "support/lyxlib.h"
+#include "support/RefChanger.h"
#include <stdlib.h>
#include <cmath>
namespace {
-// the somewhat arbitrary leading added between rows. This is 20% of
-// the characters height, inluding the possible leading of the font.
-// 20% is a standard value used by LaTeX and word processors.
-double const extra_leading = 0.2;
int numberOfLabelHfills(Paragraph const & par, Row const & row)
{
// FIXME: This check ought to be done somewhere else. It is the reason
// why text_ is not const. But then, where else to do it?
// Well, how can you end up with either (a) a biblio environment that
- // has no InsetBibitem or (b) a biblio environment with more than one
- // InsetBibitem? I think the answer is: when paragraphs are merged;
+ // has no InsetBibitem, (b) a biblio environment with more than one
+ // InsetBibitem or (c) a paragraph that has a bib item but is no biblio
+ // environment? I think the answer is: when paragraphs are merged;
// when layout is set; when material is pasted.
if (par.brokenBiblio()) {
Cursor & cur = const_cast<Cursor &>(bv_->cursor());
do {
if (row_index == pm.rows().size())
pm.rows().push_back(Row());
+ else
+ pm.rows()[row_index] = Row();
Row & row = pm.rows()[row_index];
row.pit(pit);
row.pos(first);
- row.pit(pit);
need_new_row = breakRow(row, right_margin);
setRowHeight(row);
row.changed(true);
LyXAlignment TextMetrics::getAlign(Paragraph const & par, Row const & row) const
{
- LyXAlignment align = par.getAlign();
+ LyXAlignment align = par.getAlign(bv_->buffer().params());
// handle alignment inside tabular cells
Inset const & owner = text_->inset();
*/
bool TextMetrics::breakRow(Row & row, int const right_margin) const
{
+ LATTEST(row.empty());
Paragraph const & par = text_->getPar(row.pit());
pos_type const end = par.size();
pos_type const pos = row.pos();
pos_type const body_pos = par.beginOfBody();
- bool const is_rtl = text_->isRTL(par);
+ bool const is_rtl = text_->isRTL(row.pit());
bool need_new_row = false;
- row.clear();
row.left_margin = leftMargin(row.pit(), pos);
row.right_margin = right_margin;
if (is_rtl)
Inset const * inset = 0;
if (par.isNewline(i) || par.isEnvSeparator(i)
|| (i + 1 < end && (inset = par.getInset(i + 1))
- && inset->display())
+ && inset->display())
|| (!row.empty() && row.back().inset
- && row.back().inset->display())) {
+ && row.back().inset->display())) {
row.flushed(true);
- need_new_row = par.isNewline(i);
+ // We will force a row creation after either
+ // - a newline;
+ // - a display inset followed by a end label.
+ need_new_row =
+ par.isNewline(i)
+ || (inset && inset->display() && i + 1 == end
+ && text_->getEndLabel(row.pit()) != END_LABEL_NO_LABEL);
++i;
break;
}
// Initial value for ascent (useful if row is empty).
Font const font = displayFont(row.pit(), row.pos());
FontMetrics const & fm = theFontMetrics(font);
- int maxasc = fm.maxAscent() + fm.leading();
- int maxdes = fm.maxDescent();
+ int maxasc = int(fm.maxAscent() * spacing_val);
+ int maxdes = int(fm.maxDescent() * spacing_val);
// Find the ascent/descent of the row contents
for (Row::Element const & e : row) {
- maxasc = max(maxasc, e.dim.ascent());
- maxdes = max(maxdes, e.dim.descent());
+ if (e.inset) {
+ maxasc = max(maxasc, e.dim.ascent());
+ maxdes = max(maxdes, e.dim.descent());
+ } else {
+ FontMetrics const & fm2 = theFontMetrics(e.font);
+ maxasc = max(maxasc, int(fm2.maxAscent() * spacing_val));
+ maxdes = max(maxdes, int(fm2.maxDescent() * spacing_val));
+ }
}
- // Add some leading (split between before and after)
- int const leading = support::iround(extra_leading * (maxasc + maxdes));
- row.dim().asc = int((maxasc + leading - leading / 2) * spacing_val);
- row.dim().des = int((maxdes + leading / 2) * spacing_val);
+ // This is nicer with box insets
+ ++maxasc;
+ ++maxdes;
+
+ row.dim().asc = maxasc;
+ row.dim().des = maxdes;
}
if (!par.params().leftIndent().zero())
l_margin += par.params().leftIndent().inPixels(max_width_, lfm.em());
- LyXAlignment align = par.getAlign();
+ LyXAlignment align = par.getAlign(bv_->buffer().params());
// set the correct parindent
if (pos == 0
if (pm.rows().empty())
return;
size_t const nrows = pm.rows().size();
+ // Remember left and right margin for drawing math numbers
+ Changer changeleft = make_change(pi.leftx, x + leftMargin(pit));
+ Changer changeright = make_change(pi.rightx, x + width() - rightMargin(pit));
// Use fast lane in nodraw stage.
if (pi.pain.isNull()) {
}
}
+ if (text_->isRTL(pit))
+ swap(pi.leftx, pi.rightx);
+
for (size_t i = 0; i != nrows; ++i) {
Row const & row = pm.rows()[i];
// the begining/end of row. However, it will not work if
// the caret has a ridiculous width like 6. (see ticket
// #10797)
- pi.pain.fillRectangle(max(row_x, 0) - Inset::TEXT_TO_INSET_OFFSET,
+ pi.pain.fillRectangle(max(row_x, 0) - Inset::textOffset(pi.base.bv),
y - row.ascent(),
- width() + 2 * Inset::TEXT_TO_INSET_OFFSET,
+ width() + 2 * Inset::textOffset(pi.base.bv),
row.height(), pi.background_color);
}
static int count = 0;
++count;
FontInfo fi(sane_font);
- fi.setSize(FONT_SIZE_TINY);
+ fi.setSize(TINY_SIZE);
fi.setColor(Color_red);
pi.pain.text(row_x, y, convert<docstring>(count), fi);
#endif
int defaultRowHeight()
{
- FontMetrics const & fm = theFontMetrics(sane_font);
- return support::iround(fm.maxHeight() * (1 + extra_leading) + fm.leading());
+ return int(theFontMetrics(sane_font).maxHeight() * 1.2);
}
} // namespace lyx