X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmathed%2FMathMacroTemplate.cpp;h=d4cf4cfa560bbf830c9b982564ac9fb0aa7c35f8;hb=31cd421bcd26647cb7edbb694b05473271fe9153;hp=82538e8d641542147ce0f2bc7bfbb538e13b37da;hpb=c85ad29f11391783eb871be68389f851cce61ac4;p=lyx.git

diff --git a/src/mathed/MathMacroTemplate.cpp b/src/mathed/MathMacroTemplate.cpp
index 82538e8d64..d4cf4cfa56 100644
--- a/src/mathed/MathMacroTemplate.cpp
+++ b/src/mathed/MathMacroTemplate.cpp
@@ -13,8 +13,6 @@
 
 #include "MathMacroTemplate.h"
 
-#include "DocIterator.h"
-#include "LaTeXFeatures.h"
 #include "InsetMathBrace.h"
 #include "InsetMathChar.h"
 #include "InsetMathHull.h"
@@ -31,9 +29,13 @@
 #include "Color.h"
 #include "Cursor.h"
 #include "DispatchResult.h"
+#include "DocIterator.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
+#include "LaTeXFeatures.h"
 #include "Lexer.h"
+#include "MetricsInfo.h"
+#include "TocBackend.h"
 
 #include "frontends/Painter.h"
 
@@ -267,14 +269,12 @@ Inset * InsetMathWrapper::clone() const
 void InsetMathWrapper::metrics(MetricsInfo & mi, Dimension & dim) const
 {
 	value_->metrics(mi, dim);
-	//metricsMarkers2(dim);
 }
 
 
 void InsetMathWrapper::draw(PainterInfo & pi, int x, int y) const
 {
 	value_->draw(pi, x, y);
-	//drawMarkers(pi, x, y);
 }
 
 
@@ -367,6 +367,7 @@ Inset * InsetNameWrapper::clone() const
 
 void InsetNameWrapper::metrics(MetricsInfo & mi, Dimension & dim) const
 {
+	Changer dummy = mi.base.changeFontSet("textit");
 	InsetMathWrapper::metrics(mi, dim);
 	dim.wid += mathed_string_width(mi.base.font, from_ascii("\\"));
 }
@@ -374,19 +375,17 @@ void InsetNameWrapper::metrics(MetricsInfo & mi, Dimension & dim) const
 
 void InsetNameWrapper::draw(PainterInfo & pi, int x, int y) const
 {
-	// create fonts
-	PainterInfo namepi = pi;
-	if (parent_.validMacro())
-		namepi.base.font.setColor(Color_latex);
-	else
-		namepi.base.font.setColor(Color_error);
+	ColorCode const color = parent_.validMacro() ? Color_latex : Color_error;
+
+	Changer dummy = pi.base.changeFontSet("textit");
+	Changer dummy2 = pi.base.font.changeColor(color);
 
 	// draw backslash
-	pi.pain.text(x, y, from_ascii("\\"), namepi.base.font);
-	x += mathed_string_width(namepi.base.font, from_ascii("\\"));
+	pi.pain.text(x, y, from_ascii("\\"), pi.base.font);
+	x += mathed_string_width(pi.base.font, from_ascii("\\"));
 
 	// draw name
-	InsetMathWrapper::draw(namepi, x, y);
+	InsetMathWrapper::draw(pi, x, y);
 }
 
 
@@ -395,7 +394,8 @@ void InsetNameWrapper::draw(PainterInfo & pi, int x, int y) const
 
 MathMacroTemplate::MathMacroTemplate(Buffer * buf)
 	: InsetMathNest(buf, 3), numargs_(0), argsInLook_(0), optionals_(0),
-	  type_(MacroTypeNewcommand), lookOutdated_(true)
+	  type_(MacroTypeNewcommand), redefinition_(false), lookOutdated_(true),
+	  premetrics_(false), labelBoxAscent_(0), labelBoxDescent_(0)
 {
 	initMath();
 }
@@ -406,7 +406,8 @@ MathMacroTemplate::MathMacroTemplate(Buffer * buf, docstring const & name, int n
 	MathData const & def, MathData const & display)
 	: InsetMathNest(buf, optionals + 3), numargs_(numargs), argsInLook_(numargs),
 	  optionals_(optionals), optionalValues_(optionalValues),
-	  type_(type), lookOutdated_(true)
+	  type_(type), redefinition_(false), lookOutdated_(true),
+	  premetrics_(false), labelBoxAscent_(0), labelBoxDescent_(0)
 {
 	initMath();
 
@@ -425,26 +426,20 @@ MathMacroTemplate::MathMacroTemplate(Buffer * buf, docstring const & name, int n
 }
 
 
-MathMacroTemplate::MathMacroTemplate(Buffer * buf, docstring const & str)
-	: InsetMathNest(buf, 3), numargs_(0), optionals_(0),
-	type_(MacroTypeNewcommand), lookOutdated_(true)
+bool MathMacroTemplate::fromString(docstring const & str)
 {
-	buffer_ = buf;
-	initMath();
-
-	MathData ar(buf);
+	MathData ar(buffer_);
 	mathed_parse_cell(ar, str, Parse::NORMAL);
 	if (ar.size() != 1 || !ar[0]->asMacroTemplate()) {
 		lyxerr << "Cannot read macro from '" << ar << "'" << endl;
 		asArray(from_ascii("invalidmacro"), cell(0));
-		// FIXME: The macro template does not make sense after this.
-		// The whole parsing should not be in a constructor which
-		// has no chance to report failure.
-		return;
+		// The macro template does not make sense after this.
+		return false;
 	}
 	operator=( *(ar[0]->asMacroTemplate()) );
 
 	updateLook();
+	return true;
 }
 
 
@@ -545,8 +540,8 @@ void MathMacroTemplate::createLook(int args) const
 
 void MathMacroTemplate::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-	FontSetChanger dummy1(mi.base, from_ascii("mathnormal"));
-	StyleChanger dummy2(mi.base, LM_ST_TEXT);
+	Changer dummy1 = mi.base.changeFontSet("mathnormal");
+	Changer dummy2 = mi.base.font.changeStyle(LM_ST_TEXT);
 
 	// valid macro?
 	MacroData const * macro = 0;
@@ -580,25 +575,23 @@ void MathMacroTemplate::metrics(MetricsInfo & mi, Dimension & dim) const
 	dim.wid += 6;
 	dim.des += 2;
 	dim.asc += 2;
-
-	setDimCache(mi, dim);
 }
 
 
 void MathMacroTemplate::draw(PainterInfo & pi, int x, int y) const
 {
-	ColorChanger dummy0(pi.base.font, Color_math);
-	FontSetChanger dummy1(pi.base, from_ascii("mathnormal"));
-	StyleChanger dummy2(pi.base, LM_ST_TEXT);
+	// FIXME: Calling Changer on the same object repeatedly is inefficient.
+	Changer dummy0 = pi.base.font.changeColor(Color_math);
+	Changer dummy1 = pi.base.changeFontSet("mathnormal");
+	Changer dummy2 = pi.base.font.changeStyle(LM_ST_TEXT);
 
-	setPosCache(pi, x, y);
 	Dimension const dim = dimension(*pi.base.bv);
 
 	// draw outer frame
 	int const a = y - dim.asc + 1;
 	int const w = dim.wid - 2;
 	int const h = dim.height() - 2;
-	pi.pain.rectangle(x, a, w, h, Color_mathframe);
+	pi.pain.rectangle(x + 1, a, w, h, Color_mathframe);
 
 	// just to be sure: set some dummy values for coord cache
 	for (idx_type i = 0; i < nargs(); ++i)
@@ -1173,7 +1166,8 @@ void MathMacroTemplate::read(Lexer & lex)
 void MathMacroTemplate::write(ostream & os) const
 {
 	odocstringstream oss;
-	WriteStream wi(oss, false, false, WriteStream::wsDefault);
+	otexrowstream ots(oss);
+	WriteStream wi(ots, false, false, WriteStream::wsDefault);
 	oss << "FormulaMacro\n";
 	write(wi);
 	os << to_utf8(oss.str());
@@ -1273,7 +1267,7 @@ docstring MathMacroTemplate::xhtml(XHTMLStream &, OutputParams const &) const
 int MathMacroTemplate::plaintext(odocstringstream & os,
 				 OutputParams const &, size_t) const
 {
-	static docstring const str = '[' + buffer().B_("math macro") + ']';
+	docstring const str = '[' + buffer().B_("math macro") + ']';
 
 	os << str;
 	return str.size();
@@ -1389,4 +1383,19 @@ string MathMacroTemplate::contextMenuName() const
 	return "context-math-macro-definition";
 }
 
+
+void MathMacroTemplate::addToToc(DocIterator const & pit, bool output_active,
+								 UpdateType, TocBackend & backend) const
+{
+	docstring str;
+	if (!validMacro())
+		str = bformat(_("Invalid macro! \\%1$s"), name());
+	else
+		str = "\\" + name();
+	TocBuilder & b = backend.builder("math-macro");
+	b.pushItem(pit, str, output_active);
+	b.pop();
+}
+
+
 } // namespace lyx