#include "Color.h"
#include "Length.h"
#include "LyXRC.h"
-#include "LyXText.h"
+#include "Text.h"
#include "MetricsInfo.h"
#include "ParagraphParameters.h"
#include "VSpace.h"
} // namespace anon
-TextMetrics::TextMetrics(BufferView * bv, LyXText * text)
+TextMetrics::TextMetrics(BufferView * bv, Text * text)
: bv_(bv), text_(text)
{
BOOST_ASSERT(bv_);
dim_.asc = 10;
dim_.des = 10;
- //text_->updateLabels(*bv->buffer());
+ //text_->updateLabels(bv->buffer());
}
BOOST_ASSERT(mi.base.textwidth);
max_width_ = mi.base.textwidth;
- //lyxerr << "LyXText::metrics: width: " << mi.base.textwidth
+ //lyxerr << "Text::metrics: width: " << mi.base.textwidth
// << " maxWidth: " << max_width_ << "\nfont: " << mi.base.font << endl;
-
+
bool changed = false;
unsigned int h = 0;
unsigned int w = 0;
for (pit_type pit = 0, n = text_->paragraphs().size(); pit != n; ++pit) {
changed |= redoParagraph(pit);
- ParagraphMetrics const & pm = parMetrics(pit);
+ ParagraphMetrics const & pm = par_metrics_[pit];
h += pm.height();
if (w < pm.width())
w = pm.width();
}
dim.wid = w;
- dim.asc = parMetrics(0).ascent();
+ dim.asc = par_metrics_[0].ascent();
dim.des = h - dim.asc;
changed |= dim_ != dim;
int TextMetrics::rightMargin(ParagraphMetrics const & pm) const
{
- return main_text_? pm.rightMargin(*bv_->buffer()) : 0;
+ return main_text_? pm.rightMargin(bv_->buffer()) : 0;
}
int TextMetrics::rightMargin(pit_type const pit) const
{
- return main_text_? par_metrics_[pit].rightMargin(*bv_->buffer()) : 0;
+ return main_text_? par_metrics_[pit].rightMargin(bv_->buffer()) : 0;
}
bool TextMetrics::redoParagraph(pit_type const pit)
{
+ // IMPORTANT NOTE: We pass 'false' explicitely in order to not call
+ // redoParagraph() recursively inside parMetrics.
+ Dimension old_dim = parMetrics(pit, false).dim();
+ ParagraphMetrics & pm = par_metrics_[pit];
+ // reinitialize paragraph dimension.
+ pm.dim() = Dimension();
Paragraph & par = text_->getPar(pit);
- ParagraphMetrics pm(par);
- Buffer & buffer = *bv_->buffer();
+ Buffer & buffer = bv_->buffer();
main_text_ = (text_ == &buffer.text());
bool changed = false;
- // FIXME: this has nothing to do here and is the reason why text_ is not
- // const.
- if (par.checkBiblio(buffer.params().trackChanges))
+ // 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;
+ // when layout is set; when material is pasted.
+ int const moveCursor = par.checkBiblio(buffer.params().trackChanges);
+ if (moveCursor > 0)
const_cast<Cursor &>(bv_->cursor()).posRight();
+ else if (moveCursor < 0) {
+ Cursor & cursor = const_cast<Cursor &>(bv_->cursor());
+ if (cursor.pos() >= -moveCursor)
+ cursor.posLeft();
+ }
// Optimisation: this is used in the next two loops
// so better to calculate that once here.
// redo insets
// FIXME: We should always use getFont(), see documentation of
- // noFontChange() in InsetBase.h.
- LyXFont const bufferfont = buffer.params().getFont();
+ // noFontChange() in Inset.h.
+ Font const bufferfont = buffer.params().getFont();
InsetList::const_iterator ii = par.insetlist.begin();
InsetList::const_iterator iend = par.insetlist.end();
for (; ii != iend; ++ii) {
Dimension dim;
int const w = max_width_ - text_->leftMargin(buffer, max_width_, pit, ii->pos)
- right_margin;
- LyXFont const & font = ii->inset->noFontChange() ?
+ Font const & font = ii->inset->noFontChange() ?
bufferfont : text_->getFont(buffer, par, ii->pos);
MetricsInfo mi(bv_, font, w);
changed |= ii->inset->metrics(mi, dim);
// Make sure that if a par ends in newline, there is one more row
// under it
- // FIXME this is a dirty trick. Now the _same_ position in the
- // paragraph occurs in _two_ different rows, and has two different
- // display positions, leading to weird behaviour when moving up/down.
if (z > 0 && par.isNewline(z - 1)) {
- Row row(z - 1);
- row.endpos(z - 1);
+ Row row(z);
+ row.endpos(z);
setRowWidth(right_margin, pit, row);
setHeightOfRow(pit, row);
pm.rows().push_back(row);
pm.dim().asc += pm.rows()[0].ascent();
pm.dim().des -= pm.rows()[0].ascent();
- // IMPORTANT NOTE: We pass 'false' explicitely in order to not call
- // redoParagraph() recursively inside parMetrics.
- Dimension old_dim = parMetrics(pit, false).dim();
-
changed |= old_dim.height() != pm.dim().height();
- par_metrics_[pit] = pm;
-
// Update the row change statuses. The painter will need that info
// in order to know which row has to be repainted.
- par_metrics_[pit].updateRowChangeStatus();
+ pm.updateRowChangeStatus();
return changed;
}
Row const & row) const
{
RowMetrics result;
- Buffer & buffer = *bv_->buffer();
+ Buffer & buffer = bv_->buffer();
Paragraph const & par = text_->getPar(pit);
double w = dim_.wid - row.width();
result.x = text_->leftMargin(buffer, max_width_, pit, row.pos());
// is there a manual margin with a manual label
- LyXLayout_ptr const & layout = par.layout();
+ Layout_ptr const & layout = par.layout();
if (layout->margintype == MARGIN_MANUAL
&& layout->labeltype == LABEL_MANUAL) {
++nlh;
if (nlh && !par.getLabelWidthString().empty())
- result.label_hfill = labelFill(par, row) / double(nlh);
+ result.label_hfill = labelFill(pit, row) / double(nlh);
}
// are there any hfills in the row?
// The test on par.size() is to catch zero-size pars, which
// would trigger the assert in Paragraph::getInset().
//inset = par.size() ? par.getInset(row.pos()) : 0;
- if (!par.empty()
- && par.isInset(row.pos())
- && par.getInset(row.pos())->display())
+ if (row.pos() < par.size()
+ && par.isInset(row.pos()))
{
- align = LYX_ALIGN_CENTER;
+ switch(par.getInset(row.pos())->display()) {
+ case Inset::AlignLeft:
+ align = LYX_ALIGN_BLOCK;
+ break;
+ case Inset::AlignCenter:
+ align = LYX_ALIGN_CENTER;
+ break;
+ case Inset::Inline:
+ case Inset::AlignRight:
+ // unchanged (use align)
+ break;
+ }
}
switch (align) {
int const ns = numberOfSeparators(par, row);
bool disp_inset = false;
if (row.endpos() < par.size()) {
- InsetBase const * in = par.getInset(row.endpos());
+ Inset const * in = par.getInset(row.endpos());
if (in)
disp_inset = in->display();
}
}
}
- text_->bidi.computeTables(par, buffer, row);
if (is_rtl) {
pos_type body_pos = par.beginOfBody();
pos_type end = row.endpos();
if (body_pos > 0
&& (body_pos > end || !par.isLineSeparator(body_pos - 1)))
{
- docstring const lsep = from_utf8(layout->labelsep);
- result.x += theFontMetrics(text_->getLabelFont(buffer, par)).width(lsep);
+ result.x += theFontMetrics(text_->getLabelFont(buffer, par)).
+ width(layout->labelsep);
if (body_pos <= end)
result.x += result.label_hfill;
}
}
-int TextMetrics::labelFill(Paragraph const & par, Row const & row) const
+int TextMetrics::labelFill(pit_type const pit, Row const & row) const
{
- Buffer & buffer = *bv_->buffer();
+ Buffer & buffer = bv_->buffer();
+ Paragraph const & par = text_->getPar(pit);
pos_type last = par.beginOfBody();
BOOST_ASSERT(last > 0);
int w = 0;
for (pos_type i = row.pos(); i <= last; ++i)
- w += text_->singleWidth(buffer, par, i);
+ w += singleWidth(pit, i);
docstring const & label = par.params().labelWidthString();
if (label.empty())
return 0;
- FontMetrics const & fm
+ FontMetrics const & fm
= theFontMetrics(text_->getLabelFont(buffer, par));
return max(0, fm.width(label) - w);
if (text_->getPar(pit).layout()->margintype != MARGIN_MANUAL)
return 0;
// return the beginning of the body
- return text_->leftMargin(*bv_->buffer(), max_width_, pit);
+ return text_->leftMargin(bv_->buffer(), max_width_, pit);
}
void TextMetrics::rowBreakPoint(int width, pit_type const pit,
Row & row) const
{
- Buffer & buffer = *bv_->buffer();
+ Buffer & buffer = bv_->buffer();
+ ParagraphMetrics const & pm = par_metrics_[pit];
Paragraph const & par = text_->getPar(pit);
pos_type const end = par.size();
pos_type const pos = row.pos();
return;
}
- LyXLayout_ptr const & layout = par.layout();
+ Layout_ptr const & layout = par.layout();
if (layout->margintype == MARGIN_RIGHT_ADDRESS_BOX) {
row.endpos(addressBreakPoint(pos, par));
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);
+ int thiswidth = pm.singleWidth(i, *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);
+ FontMetrics const & fm = theFontMetrics(
+ text_->getLabelFont(buffer, par));
+ int add = fm.width(layout->labelsep);
if (par.isLineSeparator(i - 1))
- add -= text_->singleWidth(buffer, par, i - 1);
+ add -= singleWidth(pit, i - 1);
add = std::max(add, label_end - x);
thiswidth += add;
void TextMetrics::setRowWidth(int right_margin,
pit_type const pit, Row & row) const
{
- Buffer & buffer = *bv_->buffer();
+ Buffer & buffer = bv_->buffer();
// get the pure distance
pos_type const end = row.endpos();
-
+ ParagraphMetrics const & pm = par_metrics_[pit];
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);
+ FontMetrics const & fm = theFontMetrics(
+ text_->getLabelFont(buffer, par));
+ w += fm.width(par.layout()->labelsep);
if (par.isLineSeparator(i - 1))
- w -= text_->singleWidth(buffer, par, i - 1);
+ w -= singleWidth(pit, i - 1);
w = max(w, label_end);
}
- char_type const c = par.getChar(i);
- w += text_->singleWidth(par, i, c, *fi);
+ w += pm.singleWidth(i, *fi);
}
}
if (body_pos > 0 && body_pos >= end) {
- w += fm.width(labelsep);
+ FontMetrics const & fm = theFontMetrics(
+ text_->getLabelFont(buffer, par));
+ w += fm.width(par.layout()->labelsep);
if (end > 0 && par.isLineSeparator(end - 1))
- w -= text_->singleWidth(buffer, par, end - 1);
+ w -= singleWidth(pit, end - 1);
w = max(w, label_end);
}
// 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();
+ Layout_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();
+ Buffer const & buffer = bv_->buffer();
+ Font font = text_->getFont(buffer, par, row.pos());
+ Font::FONT_SIZE const tmpsize = font.size();
font = text_->getLayoutFont(buffer, pit);
- LyXFont::FONT_SIZE const size = font.size();
+ Font::FONT_SIZE const size = font.size();
font.setSize(tmpsize);
- LyXFont labelfont = text_->getLabelFont(buffer, par);
+ Font labelfont = text_->getLabelFont(buffer, par);
FontMetrics const & labelfont_metrics = theFontMetrics(labelfont);
FontMetrics const & fontmetrics = theFontMetrics(font);
int labeladdon = 0;
pos_type const pos_end = row.endpos();
- LyXFont::FONT_SIZE maxsize =
+ Font::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());
+ // use standard paragraph font with the maximal size
+ Font maxfont = font;
+ maxfont.setSize(maxsize);
+ FontMetrics const & maxfontmetrics = theFontMetrics(maxfont);
+ maxasc = max(maxasc, maxfontmetrics.maxAscent());
+ maxdesc = max(maxdesc, maxfontmetrics.maxDescent());
}
// This is nicer with box insets:
// is it a top line?
if (row.pos() == 0) {
BufferParams const & bufparams = buffer.params();
- // some parksips VERY EASY IMPLEMENTATION
+ // some parskips VERY EASY IMPLEMENTATION
if (bufparams.paragraph_separation
== BufferParams::PARSEP_SKIP
+ && par.ownerCode() != Inset::ERT_CODE
+ && par.ownerCode() != Inset::LISTINGS_CODE
&& pit > 0
&& ((layout->isParagraph() && par.getDepth() == 0)
|| (pars[pit - 1].layout()->isParagraph()
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.
+ // FIXME: the correct way is to do the following is to move the
+ // following code in another method specially tailored for the
+ // main Text. 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())
+ row.endpos() == par.size() &&
+ !(row.endpos() > 0 && par.isNewline(row.endpos() - 1)))
maxdesc += 20;
}
pos_type TextMetrics::getColumnNearX(pit_type const pit,
Row const & row, int & x, bool & boundary) const
{
- Buffer const & buffer = *bv_->buffer();
+ Buffer const & buffer = bv_->buffer();
- /// For the main LyXText, it is possible that this pit is not
+ /// For the main Text, it is possible that this pit is not
/// yet in the CoordCache when moving cursor up.
/// x Paragraph coordinate is always 0 for main text anyway.
int const xo = main_text_? 0 : bv_->coordCache().get(text_, pit).x_;
x -= xo;
RowMetrics const r = computeRowMetrics(pit, row);
Paragraph const & par = text_->getPar(pit);
+ Bidi bidi;
+ bidi.computeTables(par, buffer, row);
pos_type vc = row.pos();
pos_type end = row.endpos();
pos_type c = 0;
- LyXLayout_ptr const & layout = par.layout();
+ Layout_ptr const & layout = par.layout();
bool left_side = false;
return 0;
}
- frontend::FontMetrics const & fm
- = theFontMetrics(text_->getLabelFont(buffer, par));
-
while (vc < end && tmpx <= x) {
- c = text_->bidi.vis2log(vc);
+ c = bidi.vis2log(vc);
last_tmpx = tmpx;
if (body_pos > 0 && c == body_pos - 1) {
- // FIXME UNICODE
- docstring const lsep = from_utf8(layout->labelsep);
- tmpx += r.label_hfill + fm.width(lsep);
+ FontMetrics const & fm = theFontMetrics(
+ text_->getLabelFont(buffer, par));
+ tmpx += r.label_hfill + fm.width(layout->labelsep);
if (par.isLineSeparator(body_pos - 1))
- tmpx -= text_->singleWidth(buffer, par, body_pos - 1);
+ tmpx -= singleWidth(pit, body_pos - 1);
}
if (par.hfillExpansion(row, c)) {
- tmpx += text_->singleWidth(buffer, par, c);
+ tmpx += singleWidth(pit, c);
if (c >= body_pos)
tmpx += r.hfill;
else
tmpx += r.label_hfill;
} else if (par.isSeparator(c)) {
- tmpx += text_->singleWidth(buffer, par, c);
+ tmpx += singleWidth(pit, c);
if (c >= body_pos)
tmpx += r.separator;
} else {
- tmpx += text_->singleWidth(buffer, par, c);
+ tmpx += singleWidth(pit, c);
}
++vc;
}
(!rtl && !left_side && vc == end && x > tmpx + 5)))
c = end;
else if (vc == row.pos()) {
- c = text_->bidi.vis2log(vc);
- if (text_->bidi.level(c) % 2 == 1)
+ c = bidi.vis2log(vc);
+ if (bidi.level(c) % 2 == 1)
++c;
} else {
- c = text_->bidi.vis2log(vc - 1);
- bool const rtl = (text_->bidi.level(c) % 2 == 1);
+ c = bidi.vis2log(vc - 1);
+ bool const rtl = (bidi.level(c) % 2 == 1);
if (left_side == rtl) {
++c;
- boundary = text_->bidi.isBoundary(buffer, par, c);
+ boundary = text_->isRTLBoundary(buffer, par, c);
}
}
// specially, so cursor up/down doesn't get stuck in an air gap -- MV
// Newline inset, air gap below:
if (row.pos() < end && c >= end && par.isNewline(end - 1)) {
- if (text_->bidi.level(end -1) % 2 == 0)
- tmpx -= text_->singleWidth(buffer, par, end - 1);
+ if (bidi.level(end -1) % 2 == 0)
+ tmpx -= singleWidth(pit, end - 1);
else
- tmpx += text_->singleWidth(buffer, par, end - 1);
+ tmpx += singleWidth(pit, end - 1);
c = end - 1;
}
pos_type TextMetrics::x2pos(pit_type pit, int row, int x) const
{
- ParagraphMetrics const & pm = parMetrics(pit);
+ ParagraphMetrics const & pm = par_metrics_[pit];
BOOST_ASSERT(!pm.rows().empty());
BOOST_ASSERT(row < int(pm.rows().size()));
bool bound = false;
}
-//int LyXText::pos2x(pit_type pit, pos_type pos) const
+int TextMetrics::singleWidth(pit_type pit, pos_type pos) const
+{
+ Buffer const & buffer = bv_->buffer();
+ ParagraphMetrics const & pm = par_metrics_[pit];
+
+ return pm.singleWidth(pos, text_->getFont(buffer, text_->getPar(pit), pos));
+}
+
+
+//int Text::pos2x(pit_type pit, pos_type pos) const
//{
-// ParagraphMetrics const & pm = parMetrics(pit);
+// ParagraphMetrics const & pm = par_metrics_[pit];
// Row const & r = pm.rows()[row];
// int x = 0;
// pos -= r.pos();
int defaultRowHeight()
{
- return int(theFontMetrics(LyXFont(LyXFont::ALL_SANE)).maxHeight() * 1.2);
+ return int(theFontMetrics(Font(Font::ALL_SANE)).maxHeight() * 1.2);
}
} // namespace lyx
projects / lyx.git / blobdiff