X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathSymbol.cpp;h=291dabb3b9d037e85d1ce57b8ea69dfb7295abc6;hb=593bfe248a15be99bfce7e12cde6c59c92951f5f;hp=b152388ee075d963299100fdc8ba5d3613ed0a04;hpb=e224ef029b58de61fead592a6134775dbd9a97b8;p=lyx.git

diff --git a/src/mathed/InsetMathSymbol.cpp b/src/mathed/InsetMathSymbol.cpp
index b152388ee0..291dabb3b9 100644
--- a/src/mathed/InsetMathSymbol.cpp
+++ b/src/mathed/InsetMathSymbol.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,32 +12,36 @@
 
 #include "InsetMathSymbol.h"
 
-#include "Dimension.h"
-#include "LaTeXFeatures.h"
 #include "MathAtom.h"
 #include "MathParser.h"
 #include "MathStream.h"
 #include "MathSupport.h"
 
+#include "Dimension.h"
+#include "LaTeXFeatures.h"
+#include "MetricsInfo.h"
+
 #include "support/debug.h"
 #include "support/docstream.h"
 #include "support/textutils.h"
+#include "support/unique_ptr.h"
 
+using namespace std;
 
 namespace lyx {
 
 InsetMathSymbol::InsetMathSymbol(latexkeys const * l)
-	: sym_(l), h_(0), scriptable_(false)
+	: sym_(l)
 {}
 
 
 InsetMathSymbol::InsetMathSymbol(char const * name)
-	: sym_(in_word_set(from_ascii(name))), h_(0), scriptable_(false)
+	: sym_(in_word_set(from_ascii(name)))
 {}
 
 
 InsetMathSymbol::InsetMathSymbol(docstring const & name)
-	: sym_(in_word_set(name)), h_(0), scriptable_(false)
+	: sym_(in_word_set(name))
 {}
 
 
@@ -53,58 +57,49 @@ docstring InsetMathSymbol::name() const
 }
 
 
+/// The default limits value
+Limits InsetMathSymbol::defaultLimits(bool display) const
+{
+	if (allowsLimitsChange() && sym_->extra != "func" && display)
+		return LIMITS;
+	else
+		return NO_LIMITS;
+}
+
+
 void InsetMathSymbol::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-	//lyxerr << "metrics: symbol: '" << sym_->name
-	//	<< "' in font: '" << sym_->inset
-	//	<< "' drawn as: '" << sym_->draw
-	//	<< "'" << endl;
-
-	int const em = mathed_char_width(mi.base.font, 'M');
-	FontSetChanger dummy(mi.base, sym_->inset);
-	mathed_string_dim(mi.base.font, sym_->draw, dim);
-	docstring::const_reverse_iterator rit = sym_->draw.rbegin();
-	kerning_ = mathed_char_kerning(mi.base.font, *rit);
-	// correct height for broken cmex and wasy font
-	if (sym_->inset == "cmex" || sym_->inset == "wasy") {
-		h_ = 4 * dim.des / 5;
+	// set dim
+	// FIXME: this should depend on BufferView
+	// set negative kerning_ so that a subscript is moved leftward
+	kerning_ = -mathedSymbolDim(mi.base, dim, sym_);
+	if (sym_->draw != sym_->name) {
+		// align character vertically
+		// FIXME: this should depend on BufferView
+		h_ = 0;
+		if (mathClass() == MC_OP) {
+			// center the symbol around the fraction axis
+			// See rule 13 of Appendix G of the TeXbook.
+			h_ = axis_height(mi.base) + (dim.des - dim.asc) / 2;
+		} else if (sym_->inset == "wasy") {
+			// correct height for broken wasy font
+			h_ = 4 * dim.des / 5;
+		}
 		dim.asc += h_;
 		dim.des -= h_;
 	}
-	// seperate things a bit
-	if (isRelOp())
-		dim.wid += static_cast<int>(0.5 * em + 0.5);
-	else
-		dim.wid += static_cast<int>(0.1667 * em + 0.5);
-
-	scriptable_ = false;
-	if (mi.base.style == LM_ST_DISPLAY)
-		if (sym_->inset == "cmex" || sym_->inset == "esint" ||
-		    sym_->extra == "funclim")
-			scriptable_ = true;
 }
 
 
 void InsetMathSymbol::draw(PainterInfo & pi, int x, int y) const
 {
-	//lyxerr << "metrics: symbol: '" << sym_->name
-	//	<< "' in font: '" << sym_->inset
-	//	<< "' drawn as: '" << sym_->draw
-	//	<< "'" << endl;
-	int const em = mathed_char_width(pi.base.font, 'M');
-	if (isRelOp())
-		x += static_cast<int>(0.25*em+0.5);
-	else
-		x += static_cast<int>(0.0833*em+0.5);
-
-	FontSetChanger dummy(pi.base, sym_->inset.c_str());
-	pi.draw(x, y - h_, sym_->draw);
+	mathedSymbolDraw(pi, x, y - h_, sym_);
 }
 
 
-bool InsetMathSymbol::isRelOp() const
+InsetMath::mode_type InsetMathSymbol::currentMode() const
 {
-	return sym_->extra == "mathrel";
+	return sym_->extra == "textmode" ? TEXT_MODE : MATH_MODE;
 }
 
 
@@ -114,26 +109,12 @@ bool InsetMathSymbol::isOrdAlpha() const
 }
 
 
-bool InsetMathSymbol::isScriptable() const
-{
-	return scriptable_;
-}
-
-
-bool InsetMathSymbol::takesLimits() const
+MathClass InsetMathSymbol::mathClass() const
 {
-	return
-		sym_->inset == "cmex" ||
-		sym_->inset == "lyxboldsymb" ||
-		sym_->inset == "esint" ||
-		sym_->extra == "funclim";
-}
-
-
-void InsetMathSymbol::validate(LaTeXFeatures & features) const
-{
-	if (!sym_->requires.empty())
-		features.require(to_utf8(sym_->requires));
+	if (sym_->extra == "func" || sym_->extra == "funclim")
+		return MC_OP;
+	MathClass const mc = string_to_class(sym_->extra);
+	return (mc == MC_UNKNOWN) ? MC_ORD : mc;
 }
 
 
@@ -175,23 +156,43 @@ void InsetMathSymbol::mathematica(MathematicaStream & os) const
 }
 
 
-char const * MathMLtype(docstring const & s)
+void InsetMathSymbol::mathmlize(MathMLStream & ms) const
 {
-	if (s == "mathop")
-		return "mo";
-	return "mi";
+	// FIXME We may need to do more interesting things
+	// with MathMLtype.
+	docstring tag = from_ascii(ms.namespacedTag(sym_->MathMLtype()));
+	ms << '<' << tag << ">";
+	if ((ms.xmlMode() && sym_->xmlname == "x") || (!ms.xmlMode() && sym_->htmlname == "x"))
+		// unknown so far
+		ms << name();
+	else if (ms.xmlMode())
+		ms << sym_->xmlname;
+	else
+		ms << sym_->htmlname;
+	ms << "</" << tag << '>';
 }
 
 
-void InsetMathSymbol::mathmlize(MathStream & os) const
+void InsetMathSymbol::htmlize(HtmlStream & os, bool spacing) const
 {
-	char const * type = MathMLtype(sym_->extra);
-	os << '<' << type << "> ";
-	if (sym_->xmlname == "x") // unknown so far
-		os << name();
+	// FIXME We may need to do more interesting things
+	// with MathMLtype.
+	char const * type = sym_->MathMLtype();
+	bool op = (std::string(type) == "mo");
+
+	if (sym_->htmlname == "x")
+		// unknown so far
+		os << ' ' << name() << ' ';
+	else if (op && spacing)
+		os << ' ' << sym_->htmlname << ' ';
 	else
-		os << sym_->xmlname;
-	os << " </" << type << '>';
+		os << sym_->htmlname;
+}
+
+
+void InsetMathSymbol::htmlize(HtmlStream & os) const
+{
+	htmlize(os, true);
 }
 
 
@@ -204,9 +205,13 @@ void InsetMathSymbol::octave(OctaveStream & os) const
 }
 
 
-void InsetMathSymbol::write(WriteStream & os) const
+void InsetMathSymbol::write(TeXMathStream & os) const
 {
-	MathEnsurer ensurer(os);
+	unique_ptr<MathEnsurer> ensurer;
+	if (currentMode() != TEXT_MODE)
+		ensurer = make_unique<MathEnsurer>(os);
+	else
+		ensurer = make_unique<MathEnsurer>(os, false, true, true);
 	os << '\\' << name();
 
 	// $,#, etc. In theory the restriction based on catcodes, but then
@@ -216,6 +221,7 @@ void InsetMathSymbol::write(WriteStream & os) const
 		return;
 
 	os.pendingSpace(true);
+	writeLimits(os);
 }
 
 
@@ -225,4 +231,22 @@ void InsetMathSymbol::infoize2(odocstream & os) const
 }
 
 
+void InsetMathSymbol::validate(LaTeXFeatures & features) const
+{
+	// this is not really the ideal place to do this, but we can't
+	// validate in InsetMathExInt.
+	if (features.runparams().math_flavor == OutputParams::MathAsHTML
+	    && sym_->name == from_ascii("int")) {
+		features.addCSSSnippet(
+			"span.limits{display: inline-block; vertical-align: middle; text-align:center; font-size: 75%;}\n"
+			"span.limits span{display: block;}\n"
+			"span.intsym{font-size: 150%;}\n"
+			"sub.limit{font-size: 75%;}\n"
+			"sup.limit{font-size: 75%;}");
+	} else {
+		if (!sym_->required.empty())
+			features.require(sym_->required);
+	}
+}
+
 } // namespace lyx