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

diff --git a/src/mathed/math_deliminset.C b/src/mathed/math_deliminset.C
index 5db82838bf..5882a0cd05 100644
--- a/src/mathed/math_deliminset.C
+++ b/src/mathed/math_deliminset.C
@@ -5,91 +5,153 @@
 #endif
 
 #include "math_deliminset.h"
-#include "math_iter.h"
 #include "math_parser.h"
-#include "LColor.h"
-#include "Painter.h"
-#include "mathed/support.h"
-#include "support/LOstream.h"
+#include "math_support.h"
+#include "math_mathmlstream.h"
+#include "math_streamstr.h"
+#include "math_extern.h"
 
-using std::ostream;
 
+using std::max;
 
-MathDelimInset::MathDelimInset(int l, int r, short st)
-	: MathParInset(st, "", LM_OT_DELIM), left_(l), right_(r) {}
+namespace {
+
+string convertDelimToLatexName(string const & name)
+{
+	if (name == "(")
+		return name;
+	if (name == "[")
+		return name;
+	if (name == ".")
+		return name;
+	if (name == ")")
+		return name;
+	if (name == "]")
+		return name;
+	if (name == "/")
+		return name;
+	if (name == "|")
+		return 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;
+}
 
 
-MathedInset * MathDelimInset::Clone()
-{   
+MathInset * MathDelimInset::clone() const
+{
 	return new MathDelimInset(*this);
 }
 
 
-void MathDelimInset::Write(ostream & os, bool fragile)
+void MathDelimInset::write(WriteStream & os) const
 {
-	latexkeys const * l = (left_ != '|') ?
-		lm_get_key_by_id(left_, LM_TK_SYM) : 0;
-	latexkeys const * r = (right_ != '|') ?
-		lm_get_key_by_id(right_, LM_TK_SYM) : 0;
-	os << "\\left";
-	if (l) {
-		os << '\\' << l->name << ' ';
-	} else {
-		if (left_ == '{' || left_ == '}') {
-			os << '\\' << char(left_) << ' ';
-		} else {
-			os << char(left_) << ' ';
-		}
-	}
-	MathParInset::Write(os, fragile);
-	os << "\\right";
-	if (r) {
-		os << '\\' << r->name << ' ';
-	} else {
-		if (right_ == '{' || right_ == '}') {
-			os << '\\' << char(right_) << ' ';
-		} else {
-			os << char(right_) << ' ';
-		}
+	os << "\\left" << convertDelimToLatexName(left_) << cell(0)
+	   << "\\right" << convertDelimToLatexName(right_);
+}
+
+
+void MathDelimInset::normalize(NormalStream & os) const
+{
+	os << "[delim " << convertDelimToLatexName(left_) << ' '
+	   << convertDelimToLatexName(right_) << ' ' << cell(0) << ']';
+}
+
+
+int MathDelimInset::dw() const
+{
+	int w = height() / 5;
+	if (w > 8)
+		w = 8;
+	if (w < 4)
+		w = 4;
+	return w;
+}
+
+
+void MathDelimInset::metrics(MathMetricsInfo & mi) const
+{
+	xcell(0).metrics(mi);
+	int a, d, w;
+	mathed_char_dim(mi.base.font, 'I', a, d, w);
+	int h0   = (a + d) / 2;
+	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(MathPainterInfo & pi, int x, int y) const
+{
+	int const w = dw();
+	int const b = y - ascent_;
+	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 (isAbs()) {
+		bool mat =
+			cell(0).size() == 1 && cell(0).begin()->nucleus()
+					&& cell(0).begin()->nucleus()->asMatrixInset();
+		if (mat)
+			os << "linalg[det](" << cell(0) << ")";
+		else
+			os << "abs(" << cell(0) << ")";
 	}
+	else
+		os << left_ << cell(0) << right_;
 }
 
 
-void
-MathDelimInset::draw(Painter & pain, int x, int y)
-{ 
-	xo(x);
-	yo(y); 
-	MathParInset::draw(pain, x + dw_ + 2, y - dh_); 
-	
-	if (left_ == '.') {
-		pain.line(x + 4, yo() - ascent,
-			  x + 4, yo() + descent,
-			  LColor::mathcursor, Painter::line_onoffdash);
-	} else
-		mathed_draw_deco(pain, x, y - ascent, dw_, Height(), left_);
-	x += Width() - dw_ - 2;
-	if (right_ == '.') {
-		pain.line(x + 4, yo() - ascent,
-			  x + 4, yo() + descent,
-			  LColor::mathcursor, Painter::line_onoffdash);
-	} else
-		mathed_draw_deco(pain, x, y - ascent, dw_, Height(), right_);
+void MathDelimInset::mathmlize(MathMLStream & os) const
+{
+	os << "<fenced open=\"" << left_ << "\" close=\""
+		<< right_ << "\">" << cell(0) << "</fenced>";
 }
 
 
-void
-MathDelimInset::Metrics()
+void MathDelimInset::octavize(OctaveStream & os) const
 {
-	MathParInset::Metrics();
-
-	int d;
-	mathed_char_height(LM_TC_CONST, size(), 'I', d, dh_);
-	dh_ /= 2;
-	ascent += 2 + dh_;
-	descent += 2 - dh_;
-	dw_ = Height()/5;
-	if (dw_ > 15) dw_ = 15;
-	if (dw_ < 6) dw_ = 6;
-	width += 2 * dw_ + 4;
+	if (isAbs())
+		os << "det(" << cell(0) << ")";
+	else
+		os << left_ << cell(0) << right_;
 }