X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathDelim.cpp;h=1989d48dc2d9c6d840f810ba0a4123b80834ddb6;hb=59fa0b25928b43c8d32d19a6193dc3bd07716947;hp=209e13bd7ccfaba94d9cf3431ea28b17d4d31dbe;hpb=237c132c1e6fc720b87f2fea6deb18a8395cbe0a;p=lyx.git

diff --git a/src/mathed/InsetMathDelim.cpp b/src/mathed/InsetMathDelim.cpp
index 209e13bd7c..1989d48dc2 100644
--- a/src/mathed/InsetMathDelim.cpp
+++ b/src/mathed/InsetMathDelim.cpp
@@ -4,7 +4,7 @@
  * Licence details can be found in the file COPYING.
  *
  * \author Alejandro Aguilar Sierra
- * \author André Pönitz
+ * \author André Pönitz
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -12,13 +12,22 @@
 #include <config.h>
 
 #include "InsetMathDelim.h"
+
 #include "MathData.h"
-#include "MathStream.h"
+#include "MathFactory.h"
 #include "MathStream.h"
 #include "MathSupport.h"
+#include "MetricsInfo.h"
+
+#include "LaTeXFeatures.h"
+
+#include "support/docstring.h"
 
 #include "frontends/FontMetrics.h"
 
+#include <algorithm>
+
+using namespace std;
 
 namespace lyx {
 
@@ -34,14 +43,15 @@ static docstring convertDelimToLatexName(docstring const & name)
 }
 
 
-InsetMathDelim::InsetMathDelim(docstring const & l, docstring const & r)
-	: InsetMathNest(1), left_(l), right_(r)
+InsetMathDelim::InsetMathDelim(Buffer * buf, docstring const & l,
+		docstring const & r)
+	: InsetMathNest(buf, 1), left_(l), right_(r), dw_(0)
 {}
 
 
-InsetMathDelim::InsetMathDelim
-		(docstring const & l, docstring const & r, MathData const & ar)
-	: InsetMathNest(1), left_(l), right_(r)
+InsetMathDelim::InsetMathDelim(Buffer * buf, docstring const & l, docstring const & r,
+	MathData const & ar)
+	: InsetMathNest(buf, 1), left_(l), right_(r), dw_(0)
 {
 	cell(0) = ar;
 }
@@ -53,8 +63,20 @@ Inset * InsetMathDelim::clone() const
 }
 
 
+void InsetMathDelim::validate(LaTeXFeatures & features) const
+{
+	InsetMathNest::validate(features);
+	// The delimiters may be used without \left or \right as well.
+	// Therefore they are listed in lib/symbols, and if they have
+	// requirements, we need to add them here.
+	validate_math_word(features, left_);
+	validate_math_word(features, right_);
+}
+
+
 void InsetMathDelim::write(WriteStream & os) const
 {
+	MathEnsurer ensurer(os);
 	os << "\\left" << convertDelimToLatexName(left_) << cell(0)
 	   << "\\right" << convertDelimToLatexName(right_);
 }
@@ -69,32 +91,34 @@ void InsetMathDelim::normalize(NormalStream & os) const
 
 void InsetMathDelim::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-	using std::max;
-	cell(0).metrics(mi);
+	Changer dummy = mi.base.changeEnsureMath();
+	Dimension dim0;
+	cell(0).metrics(mi, dim0, false);
 	Dimension t = theFontMetrics(mi.base.font).dimension('I');
 	int h0 = (t.asc + t.des) / 2;
-	int a0 = max(cell(0).ascent(), t.asc)   - h0;
-	int d0 = max(cell(0).descent(), t.des)  + h0;
-	dw_ = cell(0).height() / 5;
+	int a0 = max(dim0.asc, t.asc)   - h0;
+	int d0 = max(dim0.des, t.des)  + h0;
+	dw_ = dim0.height() / 5;
 	if (dw_ > 8)
 		dw_ = 8;
 	if (dw_ < 4)
 		dw_ = 4;
-	dim.wid = cell(0).width() + 2 * dw_ + 8;
+	dim.wid = dim0.width() + 2 * dw_ + 2 * mathed_thinmuskip(mi.base.font);
 	dim.asc = max(a0, d0) + h0;
 	dim.des = max(a0, d0) - h0;
-	dim_ = dim;
 }
 
 
 void InsetMathDelim::draw(PainterInfo & pi, int x, int y) const
 {
-	int const b = y - dim_.asc;
-	cell(0).draw(pi, x + dw_ + 4, y);
-	mathed_draw_deco(pi, x + 4, b, dw_, dim_.height(), left_);
-	mathed_draw_deco(pi, x + dim_.width() - dw_ - 4,
-		b, dw_, dim_.height(), right_);
-	setPosCache(pi, x, y);
+	Changer dummy = pi.base.changeEnsureMath();
+	Dimension const dim = dimension(*pi.base.bv);
+	int const b = y - dim.asc;
+	int const skip = mathed_thinmuskip(pi.base.font);
+	cell(0).draw(pi, x + dw_ + skip, y);
+	mathed_draw_deco(pi, x + skip / 2, b, dw_, dim.height(), left_);
+	mathed_draw_deco(pi, x + dim.width() - dw_ - skip / 2,
+		b, dw_, dim.height(), right_);
 }
 
 
@@ -157,8 +181,25 @@ void InsetMathDelim::mathematica(MathematicaStream & os) const
 
 void InsetMathDelim::mathmlize(MathStream & os) const
 {
-	os << "<fenced open=\"" << left_ << "\" close=\""
-		<< right_ << "\">" << cell(0) << "</fenced>";
+	os << "<mo form='prefix' fence='true' stretchy='true' symmetric='true'>"
+	   << "<mrow>"
+	   << convertDelimToXMLEscape(left_)
+	   << "</mrow>"
+	   << "</mo>\n"
+	   << cell(0)
+	   << "\n<mo form='postfix' fence='true' stretchy='true' symmetric='true'>"
+	   << "<mrow>"
+	   << convertDelimToXMLEscape(right_)
+	   << "</mrow>"
+	   << "</mo>\n";
+}
+
+
+void InsetMathDelim::htmlize(HtmlStream & os) const
+{
+	os << convertDelimToXMLEscape(left_)
+	   << cell(0)
+	   << convertDelimToXMLEscape(right_);
 }