X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FTextMetrics.cpp;h=e1cf6591e4b856a9108ca8360653fdfb0324564b;hb=1b56057e1f739551f2c410a4b0b3941246123531;hp=a0ac6afdfabbd759dbcbe848bbfdb708cffabbcb;hpb=9383f4c3c6f9cfab2d658701ba66e2b54cd68bea;p=lyx.git

diff --git a/src/TextMetrics.cpp b/src/TextMetrics.cpp
index a0ac6afdfa..e1cf6591e4 100644
--- a/src/TextMetrics.cpp
+++ b/src/TextMetrics.cpp
@@ -375,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<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
@@ -412,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);
@@ -473,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());
 
@@ -755,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;
 		}
 
@@ -1205,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());
 }
 
 
@@ -1219,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
@@ -1537,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;
@@ -1932,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