X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2Fmath_deliminset.C;h=5882a0cd0528f135211911a929115ce9a5db1ae9;hb=c649284611c4198c9d70be8a16d153cdf1ec0700;hp=435b33f1f0abc074837a3db315c9789d596079af;hpb=c93e9dcbc59d0b404561dbc7c373716f11fc13f1;p=lyx.git

diff --git a/src/mathed/math_deliminset.C b/src/mathed/math_deliminset.C
index 435b33f1f0..5882a0cd05 100644
--- a/src/mathed/math_deliminset.C
+++ b/src/mathed/math_deliminset.C
@@ -8,21 +8,15 @@
 #include "math_parser.h"
 #include "math_support.h"
 #include "math_mathmlstream.h"
+#include "math_streamstr.h"
 #include "math_extern.h"
 
 
-MathDelimInset::MathDelimInset(string const & l, string const & r)
-	: MathNestInset(1), left_(l), right_(r)
-{}
-
-
-MathInset * MathDelimInset::clone() const
-{   
-	return new MathDelimInset(*this);
-}
+using std::max;
 
+namespace {
 
-string MathDelimInset::latexName(string const & name)
+string convertDelimToLatexName(string const & name)
 {
 	if (name == "(")
 		return name;
@@ -41,83 +35,123 @@ string MathDelimInset::latexName(string const & name)
 	return "\\" + name + " ";
 }
 
+}
+
+
+
+MathDelimInset::MathDelimInset(string const & l, string const & r)
+	: MathNestInset(1), left_(l), right_(r)
+{}
+
+
+MathDelimInset::MathDelimInset
+		(string const & l, string const & r, MathArray const & ar)
+	: MathNestInset(1), left_(l), right_(r)
+{
+	cell(0) = ar;
+}
+
+
+MathInset * MathDelimInset::clone() const
+{
+	return new MathDelimInset(*this);
+}
+
 
 void MathDelimInset::write(WriteStream & os) const
 {
-	os << "\\left" << latexName(left_).c_str() << cell(0)
-	   << "\\right" << latexName(right_).c_str();
+	os << "\\left" << convertDelimToLatexName(left_) << cell(0)
+	   << "\\right" << convertDelimToLatexName(right_);
 }
 
 
 void MathDelimInset::normalize(NormalStream & os) const
 {
-	os << "[delim " << latexName(left_).c_str() << ' '
-		<< latexName(right_).c_str() << ' ' << cell(0) << ']';
+	os << "[delim " << convertDelimToLatexName(left_) << ' '
+	   << convertDelimToLatexName(right_) << ' ' << cell(0) << ']';
 }
 
 
 int MathDelimInset::dw() const
 {
 	int w = height() / 5;
-	if (w > 15)
-		w = 15;
+	if (w > 8)
+		w = 8;
 	if (w < 4)
 		w = 4;
 	return w;
 }
 
 
-void MathDelimInset::metrics(MathMetricsInfo const & mi) const
+void MathDelimInset::metrics(MathMetricsInfo & mi) const
 {
 	xcell(0).metrics(mi);
 	int a, d, w;
-	mathed_char_dim(LM_TC_VAR, mi, 'I', a, d, w);
+	mathed_char_dim(mi.base.font, 'I', a, d, w);
 	int h0   = (a + d) / 2;
-	int a0   = std::max(xcell(0).ascent(), a)   - h0;
-	int d0   = std::max(xcell(0).descent(), d)  + h0;
-	ascent_  = std::max(a0, d0) + h0;
-	descent_ = std::max(a0, d0) - h0;
-	width_   = xcell(0).width() + 2 * dw() + 4;
+	int a0   = max(xcell(0).ascent(), a)   - h0;
+	int d0   = max(xcell(0).descent(), d)  + h0;
+	ascent_  = max(a0, d0) + h0;
+	descent_ = max(a0, d0) - h0;
+	width_   = xcell(0).width() + 2 * dw() + 8;
 }
 
 
-void MathDelimInset::draw(Painter & pain, int x, int y) const
-{ 
+void MathDelimInset::draw(MathPainterInfo & pi, int x, int y) const
+{
 	int const w = dw();
 	int const b = y - ascent_;
-	xcell(0).draw(pain, x + w + 2, y);
-	mathed_draw_deco(pain, x + 1, b, w, height(), left_);
-	mathed_draw_deco(pain, x + width() - w - 1, b, w, height(), right_);
+	xcell(0).draw(pi, x + w + 4, y);
+	mathed_draw_deco(pi, x + 4, b, w, height(), left_);
+	mathed_draw_deco(pi, x + width() - w - 4, b, w, height(), right_);
+}
+
+
+bool MathDelimInset::isParanthesis() const
+{
+	return left_ == "(" && right_ == ")";
+}
+
+
+bool MathDelimInset::isBrackets() const
+{
+	return left_ == "[" && right_ == "]";
+}
+
+
+bool MathDelimInset::isAbs() const
+{
+	return left_ == "|" && right_ == "|";
 }
 
 
 void MathDelimInset::maplize(MapleStream & os) const
 {
-	if (left_ == "|" && right_ == "|") {
+	if (isAbs()) {
 		bool mat =
 			cell(0).size() == 1 && cell(0).begin()->nucleus()
 					&& cell(0).begin()->nucleus()->asMatrixInset();
-		if (mat)	
+		if (mat)
 			os << "linalg[det](" << cell(0) << ")";
 		else
 			os << "abs(" << cell(0) << ")";
 	}
 	else
-		os << left_.c_str() << cell(0) << right_.c_str();
+		os << left_ << cell(0) << right_;
 }
 
 
 void MathDelimInset::mathmlize(MathMLStream & os) const
 {
-	os << "<fenced open=\"" << left_.c_str() << "\" close=\""
-		<< right_.c_str() << "\">" << cell(0) << "</fenced>";
+	os << "<fenced open=\"" << left_ << "\" close=\""
+		<< right_ << "\">" << cell(0) << "</fenced>";
 }
 
 
 void MathDelimInset::octavize(OctaveStream & os) const
 {
-	if (left_ == "|" && right_ == "|")
+	if (isAbs())
 		os << "det(" << cell(0) << ")";
 	else
-		os << left_.c_str() << cell(0) << right_.c_str();
+		os << left_ << cell(0) << right_;
 }