#include "CoordCache.h"
#include "Cursor.h"
#include "CutAndPaste.h"
-#include "debug.h"
+#include "support/debug.h"
#include "FontIterator.h"
#include "FuncRequest.h"
#include "InsetList.h"
#include "frontends/FontMetrics.h"
#include "frontends/Painter.h"
-#include <boost/current_function.hpp>
-
using std::make_pair;
using std::max;
using std::min;
void TextMetrics::computeRowMetrics(pit_type const pit,
Row & row, int width) const
{
-
row.label_hfill = 0;
- row.hfill = 0;
row.separator = 0;
Buffer & buffer = bv_->buffer();
row.label_hfill = labelFill(pit, row) / double(nlh);
}
- // are there any hfills in the row?
- int const nh = numberOfHfills(par, row);
-
- if (nh) {
- if (w > 0)
- row.hfill = w / nh;
+ double hfill = 0;
+ if (w > 0) {
+ // are there any hfills in the row?
+ if (int nh = numberOfHfills(par, row))
+ hfill = w / double(nh);
// we don't have to look at the alignment if it is ALIGN_LEFT and
// if the row is already larger then the permitted width as then
// we force the LEFT_ALIGN'edness!
row.x += row.label_hfill;
}
}
+
+ pos_type const endpos = row.endpos();
+ pos_type body_pos = par.beginOfBody();
+ if (body_pos > 0
+ && (body_pos > endpos || !par.isLineSeparator(body_pos - 1)))
+ body_pos = 0;
+
+ ParagraphMetrics & pm = par_metrics_[pit];
+ InsetList::const_iterator ii = par.insetList().begin();
+ InsetList::const_iterator iend = par.insetList().end();
+ for ( ; ii != iend; ++ii) {
+ if (ii->pos >= endpos || ii->pos < row.pos()
+ || ii->inset->lyxCode() != HFILL_CODE)
+ continue;
+ Dimension dim = row.dimension();
+ if (pm.hfillExpansion(row, ii->pos))
+ dim.wid = int(ii->pos >= body_pos ?
+ max(hfill, 5.0) : row.label_hfill);
+ else
+ dim.wid = 5;
+ // Cache the inset dimension.
+ bv_->coordCache().insets().add(ii->inset, dim);
+ pm.setInsetDimension(ii->inset, dim);
+ }
}
int const xo = origin_.x_;
x -= xo;
Paragraph const & par = text_->getPar(pit);
- ParagraphMetrics const & pm = par_metrics_[pit];
Bidi bidi;
bidi.computeTables(par, buffer, row);
tmpx -= singleWidth(pit, body_pos - 1);
}
- if (pm.hfillExpansion(row, c)) {
- tmpx += singleWidth(pit, c);
- if (c >= body_pos)
- tmpx += row.hfill;
- else
- tmpx += row.label_hfill;
- } else if (par.isSeparator(c)) {
- tmpx += singleWidth(pit, c);
- if (c >= body_pos)
+ tmpx += singleWidth(pit, c);
+ if (par.isSeparator(c) && c >= body_pos)
tmpx += row.separator;
- } else {
- tmpx += singleWidth(pit, c);
- }
++vc;
}
pit_type TextMetrics::getPitNearY(int y)
{
BOOST_ASSERT(!text_->paragraphs().empty());
- LYXERR(Debug::DEBUG, BOOST_CURRENT_FUNCTION
- << ": y: " << y << " cache size: " << par_metrics_.size());
+ LYXERR(Debug::DEBUG, "y: " << y << " cache size: " << par_metrics_.size());
// look for highest numbered paragraph with y coordinate less than given y
pit_type pit = -1;
}
for (; it != et; ++it) {
- LYXERR(Debug::DEBUG, BOOST_CURRENT_FUNCTION
- << " examining: pit: " << it->first
+ LYXERR(Debug::DEBUG, "examining: pit: " << it->first
<< " y: " << it->second.position());
ParagraphMetrics const & pm = par_metrics_[it->first];
}
}
- LYXERR(Debug::DEBUG, BOOST_CURRENT_FUNCTION
- << ": found best y: " << yy << " for pit: " << pit);
+ LYXERR(Debug::DEBUG, "found best y: " << yy << " for pit: " << pit);
return pit;
}
ParagraphMetrics const & pm = par_metrics_[pit];
int yy = pm.position() - pm.ascent();
- LYXERR(Debug::DEBUG, BOOST_CURRENT_FUNCTION
- << ": x: " << x << " y: " << y << " pit: " << pit << " yy: " << yy);
+ LYXERR(Debug::DEBUG, "x: " << x << " y: " << y <<
+ " pit: " << pit << " yy: " << yy);
int r = 0;
BOOST_ASSERT(pm.rows().size());
Row const & row = pm.rows()[r];
- LYXERR(Debug::DEBUG, BOOST_CURRENT_FUNCTION
- << ": row " << r << " from pos: " << row.pos());
+ LYXERR(Debug::DEBUG, "row " << r << " from pos: " << row.pos());
bool bound = false;
int xx = x;
pos_type const pos = row.pos() + getColumnNearX(pit, row, xx, bound);
- LYXERR(Debug::DEBUG, BOOST_CURRENT_FUNCTION
- << ": setting cursor pit: " << pit << " pos: " << pos);
+ LYXERR(Debug::DEBUG, "setting cursor pit: " << pit << " pos: " << pos);
text_->setCursor(cur, pit, pos, true, bound);
// remember new position.
Paragraph const & par = text_->paragraphs()[pit];
ParagraphMetrics const & pm = par_metrics_[pit];
- LYXERR(Debug::DEBUG, BOOST_CURRENT_FUNCTION
- << ": x: " << x << " y: " << y << " pit: " << pit);
+ LYXERR(Debug::DEBUG, "x: " << x << " y: " << y << " pit: " << pit);
InsetList::const_iterator iit = par.insetList().begin();
InsetList::const_iterator iend = par.insetList().end();
for (; iit != iend; ++iit) {
Inset * inset = iit->inset;
- LYXERR(Debug::DEBUG, BOOST_CURRENT_FUNCTION
- << ": examining inset " << inset);
+ LYXERR(Debug::DEBUG, "examining inset " << inset);
if (!bv_->coordCache().getInsets().has(inset)) {
- LYXERR(Debug::DEBUG, BOOST_CURRENT_FUNCTION
- << ": inset has no cached position");
+ LYXERR(Debug::DEBUG, "inset has no cached position");
return 0;
}
Dimension const & dim = pm.insetDimension(inset);
Point p = bv_->coordCache().getInsets().xy(inset);
- LYXERR(Debug::DEBUG, BOOST_CURRENT_FUNCTION
- << ": xo: " << p.x_ << "..." << p.x_ + dim.wid
+ LYXERR(Debug::DEBUG, "xo: " << p.x_ << "..." << p.x_ + dim.wid
<< " yo: " << p.y_ - dim.asc << "..." << p.y_ + dim.des);
if (x >= p.x_
&& x <= p.x_ + dim.wid
&& y >= p.y_ - dim.asc
&& y <= p.y_ + dim.des) {
- LYXERR(Debug::DEBUG, BOOST_CURRENT_FUNCTION
- << ": Hit inset: " << inset);
+ LYXERR(Debug::DEBUG, "Hit inset: " << inset);
return inset;
}
}
- LYXERR(Debug::DEBUG, BOOST_CURRENT_FUNCTION << ": No inset hit. ");
+ LYXERR(Debug::DEBUG, "No inset hit. ");
return 0;
}
x += pm.singleWidth(pos, font);
- if (pm.hfillExpansion(row, pos))
- x += (pos >= body_pos) ? row.hfill : row.label_hfill;
- else if (par.isSeparator(pos) && pos >= body_pos)
+ if (par.isSeparator(pos) && pos >= body_pos)
x += row.separator;
}