X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathFont.cpp;h=a017dd810c4ac3e08af92ff71325f05f4511ebb9;hb=4c724a6072013247ac178f0acec06825585c6c55;hp=e079868a1a103f2a74fcc5cdcc64334aafc0c960;hpb=31059d1741933d95403e7f07ed033cae482f778b;p=lyx.git

diff --git a/src/mathed/InsetMathFont.cpp b/src/mathed/InsetMathFont.cpp
index e079868a1a..a017dd810c 100644
--- a/src/mathed/InsetMathFont.cpp
+++ b/src/mathed/InsetMathFont.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.
  */
@@ -11,26 +11,30 @@
 #include <config.h>
 
 #include "InsetMathFont.h"
+
+#include "LaTeXFeatures.h"
 #include "MathData.h"
 #include "MathStream.h"
 #include "MathParser.h"
-#include "LaTeXFeatures.h"
-#include "support/std_ostream.h"
+#include "MetricsInfo.h"
 
+#include "support/gettext.h"
+#include "support/lstrings.h"
 
-namespace lyx {
+#include <ostream>
 
-using std::auto_ptr;
+using namespace lyx::support;
 
+namespace lyx {
 
-InsetMathFont::InsetMathFont(latexkeys const * key)
-	: InsetMathNest(1), key_(key)
+InsetMathFont::InsetMathFont(Buffer * buf, latexkeys const * key)
+	: InsetMathNest(buf, 1), key_(key)
 {}
 
 
-auto_ptr<InsetBase> InsetMathFont::doClone() const
+Inset * InsetMathFont::clone() const
 {
-	return auto_ptr<InsetBase>(new InsetMathFont(*this));
+	return new InsetMathFont(*this);
 }
 
 
@@ -44,21 +48,25 @@ InsetMath::mode_type InsetMathFont::currentMode() const
 }
 
 
-bool InsetMathFont::metrics(MetricsInfo & mi, Dimension & dim) const
+bool InsetMathFont::lockedMode() const
+{
+	if (key_->extra == "forcetext")
+		return true;
+	return false;
+}
+
+
+void InsetMathFont::metrics(MetricsInfo & mi, Dimension & dim) const
 {
 	FontSetChanger dummy(mi.base, key_->name);
 	cell(0).metrics(mi, dim);
 	metricsMarkers(dim);
-	if (dim_ == dim)
-		return false;
-	dim_ = dim;
-	return true;
 }
 
 
 void InsetMathFont::draw(PainterInfo & pi, int x, int y) const
 {
-	FontSetChanger dummy(pi.base, key_->name.c_str());
+	FontSetChanger dummy(pi.base, key_->name);
 	cell(0).draw(pi, x + 1, y);
 	drawMarkers(pi, x, y);
 	setPosCache(pi, x, y);
@@ -67,7 +75,9 @@ void InsetMathFont::draw(PainterInfo & pi, int x, int y) const
 
 void InsetMathFont::metricsT(TextMetricsInfo const & mi, Dimension &) const
 {
-	cell(0).metricsT(mi, dim_);
+	// FIXME: BROKEN!
+	Dimension dim;
+	cell(0).metricsT(mi, dim);
 }
 
 
@@ -86,20 +96,121 @@ docstring InsetMathFont::name() const
 void InsetMathFont::validate(LaTeXFeatures & features) const
 {
 	InsetMathNest::validate(features);
-	// Make sure amssymb is put in preamble if Blackboard Bold or
-	// Fraktur used:
-	if (key_->name == "mathfrak" || key_->name == "mathbb")
-		features.require("amssymb");
-	if (key_->name == "text")
-		features.require("amsmath");
-	if (key_->name == "textipa")
-		features.require("tipa");
+	if (features.runparams().isLaTeX()) {
+		// Make sure amssymb is put in preamble if Blackboard Bold or
+		// Fraktur used:
+		if (key_->name == "mathfrak" || key_->name == "mathbb")
+			features.require("amssymb");
+		if (key_->name == "text" || key_->name == "textnormal"
+				|| (key_->name.length() == 6 && key_->name.substr(0, 4) == "text"))
+			features.require("amstext");
+		if (key_->name == "mathscr")
+			features.require("mathrsfs");
+		if (key_->name == "textipa")
+			features.require("tipa");
+		if (key_->name == "ce" || key_->name == "cf")
+			features.require("mhchem");
+	} else if (features.runparams().math_flavor == OutputParams::MathAsHTML) {
+		features.addCSSSnippet(
+			"span.normal{font: normal normal normal inherit serif;}\n"
+			"span.fraktur{font: normal normal normal inherit cursive;}\n"
+			"span.bold{font: normal normal bold inherit serif;}\n"
+			"span.script{font: normal normal normal inherit cursive;}\n"
+			"span.italic{font: italic normal normal inherit serif;}\n"
+			"span.sans{font: normal normal normal inherit sans-serif;}\n"
+			"span.monospace{font: normal normal normal inherit monospace;}\n"
+			"span.noun{font: normal small-caps normal inherit normal;}");
+	}
+}
+
+
+// The fonts we want to support are listed in lib/symbols
+void InsetMathFont::htmlize(HtmlStream & os) const
+{
+	// FIXME These are not quite right, because they do not nest
+	// correctly. A proper fix would presumably involve tracking
+	// the fonts already in effect.
+	std::string variant;
+	docstring const & tag = key_->name;
+	if (tag == "mathnormal" || tag == "mathrm"
+	    || tag == "text" || tag == "textnormal"
+	    || tag == "textrm" || tag == "textup"
+	    || tag == "textmd")
+		variant = "normal";
+	else if (tag == "frak" || tag == "mathfrak")
+		variant = "fraktur";
+	else if (tag == "mathbb" || tag == "mathbf"
+	         || tag == "textbf")
+		variant = "bold";
+	else if (tag == "mathcal")
+		variant = "script";
+	else if (tag == "mathit" || tag == "textsl"
+	         || tag == "emph" || tag == "textit")
+		variant = "italic";
+	else if (tag == "mathsf" || tag == "textsf")
+		variant = "sans";
+	else if (tag == "mathtt" || tag == "texttt")
+		variant = "monospace";
+	else if (tag == "textipa" || tag == "textsc" || tag == "noun")
+		variant = "noun";
+
+	docstring const beg = (tag.size() < 4) ? from_ascii("") : tag.substr(0, 4);
+	if (!variant.empty()) {
+		os << MTag("span", "class='" + variant + "'")
+		   << cell(0)
+		   << ETag("span");
+	} else
+		os << cell(0);
+}
+
+
+// The fonts we want to support are listed in lib/symbols
+void InsetMathFont::mathmlize(MathStream & os) const
+{
+	// FIXME These are not quite right, because they do not nest
+	// correctly. A proper fix would presumably involve tracking
+	// the fonts already in effect.
+	std::string variant;
+	docstring const & tag = key_->name;
+	if (tag == "mathnormal" || tag == "mathrm"
+	    || tag == "text" || tag == "textnormal"
+	    || tag == "textrm" || tag == "textup"
+	    || tag == "textmd")
+		variant = "normal";
+	else if (tag == "frak" || tag == "mathfrak")
+		variant = "fraktur";
+	else if (tag == "mathbb" || tag == "mathbf"
+	         || tag == "textbf")
+		variant = "bold";
+	else if (tag == "mathcal")
+		variant = "script";
+	else if (tag == "mathit" || tag == "textsl"
+	         || tag == "emph" || tag == "textit")
+		variant = "italic";
+	else if (tag == "mathsf" || tag == "textsf")
+		variant = "sans-serif";
+	else if (tag == "mathtt" || tag == "texttt")
+		variant = "monospace";
+	// no support at present for textipa, textsc, noun
+
+	if (!variant.empty()) {
+		if (tag == "mathbb") {
+			os << MTag("mstyle", "class='mathbb' mathvariant='" + variant + "'")
+			   << cell(0)
+			   << ETag("mstyle");
+		} else {
+			os << MTag("mstyle", "mathvariant='" + variant + "'")
+				 << cell(0)
+				 << ETag("mstyle");
+		}
+	} else
+		os << cell(0);
 }
 
 
 void InsetMathFont::infoize(odocstream & os) const
 {
-	os << "Font: " << key_->name;
+	os << bformat(_("Font: %1$s"), key_->name);
 }