#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;
-using std::endl;
-using std::pair;
+using namespace std;
namespace lyx {
// so better to calculate that once here.
int const right_margin = rightMargin(pm);
+ // iterator pointing to paragraph to resolve macros
+ DocIterator parPos = text_->macrocontextPosition();
+ if (!parPos.empty())
+ parPos.pit() = pit;
+ else {
+ LYXERR(Debug::INFO, "MacroContext not initialised!"
+ << " Going through the buffer again and hope"
+ << " the context is better then.");
+ updateLabels(bv_->buffer());
+ parPos = text_->macrocontextPosition();
+ BOOST_ASSERT(!parPos.empty());
+ parPos.pit() = pit;
+ }
+
// redo insets
// FIXME: We should always use getFont(), see documentation of
// noFontChange() in Inset.h.
Font const bufferfont = buffer.params().getFont();
- MacroContext mc(buffer, par);
InsetList::const_iterator ii = par.insetList().begin();
InsetList::const_iterator iend = par.insetList().end();
for (; ii != iend; ++ii) {
- // the macro must come here, _before_ the metric call, because
- // the macro should see itself to detect recursions. To find out
- // whether the macro definition is a redefinition it will look
- // at the MacroData::redefinition_. So it doesn't get confused
- // by the already existing macro definition of itself in the
- // macro context.
- if (ii->inset->lyxCode() == MATHMACRO_CODE) {
- // get macro data
- MathMacroTemplate const & macroTemplate
- = static_cast<MathMacroTemplate const &>(*ii->inset);
-
- // valid?
- if (macroTemplate.validMacro()) {
- MacroData macro = macroTemplate.asMacroData();
-
- // redefinition?
- macro.setRedefinition(mc.has(macroTemplate.name()));
-
- // register macro (possibly overwrite the previous one of this paragraph)
- mc.insert(macroTemplate.name(), macro);
- }
+ // position already initialized?
+ if (!parPos.empty()) {
+ parPos.pos() = ii->pos;
+
+ // A macro template would normally not be visible
+ // by itself. But the tex macro semantics allow
+ // recursion, so we artifically take the context
+ // after the macro template to simulate this.
+ if (ii->inset->lyxCode() == MATHMACRO_CODE)
+ parPos.pos()++;
}
// do the metric calculation
- right_margin;
Font const & font = ii->inset->noFontChange() ?
bufferfont : getDisplayFont(pit, ii->pos);
+ MacroContext mc(buffer, parPos);
MetricsInfo mi(bv_, font.fontInfo(), w, mc);
ii->inset->metrics(mi, dim);
Dimension const old_dim = pm.insetDimension(ii->inset);
first = end;
++row_index;
- pm.dim().wid = std::max(pm.dim().wid, dim.wid);
+ pm.dim().wid = max(pm.dim().wid, dim.wid);
pm.dim().des += dim.height();
} while (first < par.size());
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);
}
+ double hfill = 0;
// are there any hfills in the row?
- int const nh = numberOfHfills(par, row);
-
- if (nh) {
+ if (int const nh = numberOfHfills(par, row)) {
if (w > 0)
- row.hfill = w / nh;
+ 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);
+ }
}
if (par.isLineSeparator(i - 1))
add -= singleWidth(pit, i - 1);
- add = std::max(add, label_end - x);
+ add = max(add, label_end - x);
thiswidth += add;
}
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;
}
bool const rtl = lastrow ? text_->isRTL(buffer, par) : false;
if (lastrow &&
((rtl && left_side && vc == row.pos() && x < tmpx - 5) ||
- (!rtl && !left_side && vc == end && x > tmpx + 5)))
- c = end;
- else if (vc == row.pos()) {
+ (!rtl && !left_side && vc == end && x > tmpx + 5))) {
+ if (!par.isNewline(end - 1))
+ c = end;
+ } else if (vc == row.pos()) {
c = bidi.vis2log(vc);
if (bidi.level(c) % 2 == 1)
++c;
// do it and update its position.
redoParagraph(pit);
par_metrics_[pit].setPosition(last.second.position()
- + last.second.descent());
+ + last.second.descent() + par_metrics_[pit].ascent());
}
// do it and update its position.
redoParagraph(pit);
par_metrics_[pit].setPosition(first.second.position()
- - first.second.ascent());
+ - first.second.ascent() - par_metrics_[pit].descent());
}
// y is screen coordinate
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;
}
Inset * TextMetrics::editXY(Cursor & cur, int x, int y)
{
if (lyxerr.debugging(Debug::WORKAREA)) {
- lyxerr << "TextMetrics::editXY(cur, " << x << ", " << y << ")" << std::endl;
+ LYXERR0("TextMetrics::editXY(cur, " << x << ", " << y << ")");
cur.bv().coordCache().dump();
}
pit_type pit = getPitNearY(y);
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;
}
int TextMetrics::cursorY(CursorSlice const & sl, bool boundary) const
{
- //lyxerr << "TextMetrics::cursorY: boundary: " << boundary << std::endl;
+ //lyxerr << "TextMetrics::cursorY: boundary: " << boundary << endl;
ParagraphMetrics const & pm = par_metrics_[sl.pit()];
if (pm.rows().empty())
return 0;
text_->deleteWordForward(cur);
else
cap::cutSelection(cur, true, false);
- checkBufferStructure(cur.buffer(), cur);
+ cur.checkBufferStructure();
}
}
// 12 lines lower):
if (lyxerr.debugging(Debug::PAINTING) && inside
&& (row_selection || pi.full_repaint || row_has_changed)) {
- std::string const foreword = text_->isMainText(bv_->buffer()) ?
+ string const foreword = text_->isMainText(bv_->buffer()) ?
"main text redraw " : "inset text redraw: ";
LYXERR(Debug::PAINTING, foreword << "pit=" << pit << " row=" << i
<< " row_selection=" << row_selection
// Re-enable screen drawing for future use of the painter.
pi.pain.setDrawingEnabled(original_drawing_state);
- //LYXERR(Debug::PAINTING) << "." << endl;
+ //LYXERR(Debug::PAINTING, ".");
}