X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FTextMetrics.cpp;h=e1cf6591e4b856a9108ca8360653fdfb0324564b;hb=1b56057e1f739551f2c410a4b0b3941246123531;hp=737024af1b7439cf8884bfe495398f0533d88005;hpb=920c3c3e366b8452f62b170361ffffc56fd08199;p=lyx.git diff --git a/src/TextMetrics.cpp b/src/TextMetrics.cpp index 737024af1b..e1cf6591e4 100644 --- a/src/TextMetrics.cpp +++ b/src/TextMetrics.cpp @@ -49,10 +49,7 @@ #include "frontends/FontMetrics.h" #include "frontends/Painter.h" -using std::make_pair; -using std::max; -using std::min; -using std::pair; +using namespace std; namespace lyx { @@ -378,35 +375,28 @@ bool TextMetrics::redoParagraph(pit_type const pit) // 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; + // 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(*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 @@ -415,6 +405,7 @@ bool TextMetrics::redoParagraph(pit_type const pit) - 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); @@ -476,7 +467,7 @@ bool TextMetrics::redoParagraph(pit_type const pit) 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()); @@ -513,7 +504,6 @@ 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(); @@ -553,12 +543,11 @@ void TextMetrics::computeRowMetrics(pit_type const pit, 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! @@ -653,9 +642,10 @@ void TextMetrics::computeRowMetrics(pit_type const pit, continue; Dimension dim = row.dimension(); if (pm.hfillExpansion(row, ii->pos)) - dim.wid = int(ii->pos >= body_pos ? row.hfill : row.label_hfill); + dim.wid = int(ii->pos >= body_pos ? + max(hfill, 5.0) : row.label_hfill); else - dim.wid = 3; + dim.wid = 5; // Cache the inset dimension. bv_->coordCache().insets().add(ii->inset, dim); pm.setInsetDimension(ii->inset, dim); @@ -759,7 +749,7 @@ pit_type TextMetrics::rowBreakPoint(int width, pit_type const pit, 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; } @@ -1209,7 +1199,7 @@ void TextMetrics::newParMetricsDown() // 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()); } @@ -1223,7 +1213,7 @@ void TextMetrics::newParMetricsUp() // 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 @@ -1541,7 +1531,7 @@ int TextMetrics::cursorX(CursorSlice const & sl, 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; @@ -1936,7 +1926,7 @@ void TextMetrics::drawParagraph(PainterInfo & pi, pit_type pit, int x, int y) co // 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