X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathBig.cpp;h=969dd472c72fd5e512df6675cd30cda043952037;hb=61448d8cb2e922a9a891817a114c76c687be4811;hp=cbd5c8a4f0d71ae5b51cc6133fa7a3628e34c9b8;hpb=9daf07588f49b52eb5e2fd5e8e8a58705e2e447e;p=lyx.git

diff --git a/src/mathed/InsetMathBig.cpp b/src/mathed/InsetMathBig.cpp
index cbd5c8a4f0..969dd472c7 100644
--- a/src/mathed/InsetMathBig.cpp
+++ b/src/mathed/InsetMathBig.cpp
@@ -3,7 +3,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author André Pönitz
+ * \author André Pönitz
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -12,12 +12,14 @@
 
 #include "InsetMathBig.h"
 
+#include "LaTeXFeatures.h"
 #include "MathSupport.h"
 #include "MathStream.h"
 #include "MetricsInfo.h"
 
 #include "frontends/FontMetrics.h"
 
+#include "support/docstream.h"
 #include "support/lstrings.h"
 
 
@@ -45,9 +47,11 @@ InsetMathBig::size_type InsetMathBig::size() const
 {
 	// order: big Big bigg Bigg biggg Biggg
 	//        0   1   2    3    4     5
+	char_type const c = name_[name_.size() - 1];
+	int const base_size = (c == 'l' || c == 'm' || c == 'r') ? 4 : 3;
 	return name_[0] == 'B' ?
-		2 * (name_.size() - 4) + 1:
-		2 * (name_.size() - 4);
+		2 * (name_.size() - base_size) + 1:
+		2 * (name_.size() - base_size);
 }
 
 
@@ -68,8 +72,6 @@ void InsetMathBig::metrics(MetricsInfo & mi, Dimension & dim) const
 	dim.wid = 6;
 	dim.asc = int(h + f * h);
 	dim.des = int(f * h);
-	// Cache the inset dimension. 
-	setDimCache(mi, dim);
 }
 
 
@@ -90,6 +92,7 @@ void InsetMathBig::draw(PainterInfo & pi, int x, int y) const
 
 void InsetMathBig::write(WriteStream & os) const
 {
+	MathEnsurer ensurer(os);
 	os << '\\' << name_ << delim_;
 	if (delim_[0] == '\\')
 		os.pendingSpace(true);
@@ -102,6 +105,107 @@ void InsetMathBig::normalize(NormalStream & os) const
 }
 
 
+void InsetMathBig::mathmlize(MathStream & os) const
+{
+	os << "<mo form='prefix' fence='true' stretchy='true' symmetric='true'>";
+	if (delim_ == "(" || delim_ == ")"
+			|| delim_ == "[" || delim_ == "]"
+			|| delim_ == "|" || delim_ == "/")
+		os << delim_;
+	else if (delim_ == "\\{" || delim_ == "\\lbrace")
+		os << "{";
+	else if (delim_ == "\\}" || delim_ == "\\rbrace")
+		os << "}";
+	else if (delim_ == "\\slash")
+		os << "/";
+	else if (delim_ == "\\|" || delim_ == "\\vert")
+		os << "|";
+	else if (delim_ == "\\Vert")
+		os << "&par;";
+	else if (delim_ == "\\\\" || delim_ == "\\backslash")
+		os <<" \\";
+	else if (delim_ == "\\langle")
+		os << "&lt;";
+	else if (delim_ == "\\rangle")
+		os << "&gt;";
+	else if (delim_ == "\\lceil")
+		os << "&lceil;";
+	else if (delim_ == "\\rceil")
+		os << "&rceil;";
+	else if (delim_ == "\\lfloor")
+		os << "&lfloor;";
+	else if (delim_ == "\\rfloor")
+		os << "&rfloor;";
+	else if (delim_ == "\\downarrow")
+		os << "&darr;";
+	else if (delim_ == "\\uparrow")
+		os << "&uarr;";
+	else if (delim_ == "\\Downarrow")
+		os << "&dArr;";
+	else if (delim_ == "\\Uparrow")
+		os << "&uArr;";
+	else if (delim_ == "\\updownarrow")
+		os << "&varr;";
+	else if (delim_ == "\\Updownarrow")
+		os << "&vArr;";
+	os << "</mo>";
+}
+
+
+void InsetMathBig::htmlize(HtmlStream & os) const
+{
+	std::string name;
+	switch (size()) {
+	case 0: case 1: name = "big"; break;
+	case 2: case 3: name = "bigg"; break;
+	case 4: case 5: name = "biggg"; break;
+	default: name  = "big"; break;
+	}
+	os << MTag("span", "class='" + name + "symbol'");
+	if (delim_ == "(" || delim_ == ")"
+			|| delim_ == "[" || delim_ == "]"
+			|| delim_ == "|" || delim_ == "/")
+		os << delim_;
+	else if (delim_ == "\\{" || delim_ == "\\lbrace")
+		os << "{";
+	else if (delim_ == "\\}" || delim_ == "\\rbrace")
+		os << "}";
+	else if (delim_ == "\\slash")
+		os << "/";
+	else if (delim_ == "\\|" || delim_ == "\\vert")
+		os << "|";
+	else if (delim_ == "\\Vert")
+		os << "&par;";
+	else if (delim_ == "\\\\" || delim_ == "\\backslash")
+		os <<" \\";
+	else if (delim_ == "\\langle")
+		os << "&lt;";
+	else if (delim_ == "\\rangle")
+		os << "&gt;";
+	else if (delim_ == "\\lceil")
+		os << "&lceil;";
+	else if (delim_ == "\\rceil")
+		os << "&rceil;";
+	else if (delim_ == "\\lfloor")
+		os << "&lfloor;";
+	else if (delim_ == "\\rfloor")
+		os << "&rfloor;";
+	else if (delim_ == "\\downarrow")
+		os << "&darr;";
+	else if (delim_ == "\\uparrow")
+		os << "&uarr;";
+	else if (delim_ == "\\Downarrow")
+		os << "&dArr;";
+	else if (delim_ == "\\Uparrow")
+		os << "&uArr;";
+	else if (delim_ == "\\updownarrow")
+		os << "&varr;";
+	else if (delim_ == "\\Updownarrow")
+		os << "&vArr;";
+	os << ETag("span");
+}
+
+
 void InsetMathBig::infoize2(odocstream & os) const
 {
 	os << name_;
@@ -114,7 +218,7 @@ bool InsetMathBig::isBigInsetDelim(docstring const & delim)
 	static char const * const delimiters[] = {
 		"(", ")", "\\{", "\\}", "\\lbrace", "\\rbrace", "[", "]",
 		"|", "/", "\\slash", "\\|", "\\vert", "\\Vert", "'",
-		"\\\\", "\\backslash",
+		"<", ">", "\\\\", "\\backslash",
 		"\\langle", "\\lceil", "\\lfloor",
 		"\\rangle", "\\rceil", "\\rfloor",
 		"\\downarrow", "\\Downarrow",
@@ -125,4 +229,14 @@ bool InsetMathBig::isBigInsetDelim(docstring const & delim)
 }
 
 
+void InsetMathBig::validate(LaTeXFeatures & features) const
+{
+	if (features.runparams().math_flavor == OutputParams::MathAsHTML)
+		features.addCSSSnippet(
+			"span.bigsymbol{font-size: 150%;}\n"
+			"span.biggsymbol{font-size: 200%;}\n"
+			"span.bigggsymbol{font-size: 225%;}");
+}
+
+
 } // namespace lyx