Fixes to input method handling

[lyx.git] / src / mathed / InsetMathBoldSymbol.cpp

diff --git a/src/mathed/InsetMathBoldSymbol.cpp b/src/mathed/InsetMathBoldSymbol.cpp
index 6ef4de7099b862cbbf17b2fe0d4e6573278bc8ce..62f8098fa1c1ecf0ed8d8ff6c83cdb8295a6f234 100644 (file)
--- a/src/mathed/InsetMathBoldSymbol.cpp
+++ b/src/mathed/InsetMathBoldSymbol.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.
  */
@@ -14,6 +14,7 @@
 
 #include "MathStream.h"
 #include "MathData.h"
+#include "MetricsInfo.h"
 #include "LaTeXFeatures.h"
 
 #include <ostream>
@@ -21,8 +22,8 @@
 
 namespace lyx {
 
-InsetMathBoldSymbol::InsetMathBoldSymbol()
-       : InsetMathNest(1)
+InsetMathBoldSymbol::InsetMathBoldSymbol(Buffer * buf, Kind kind)
+       : InsetMathNest(buf, 1), kind_(kind)
 {}
 
 
@@ -32,23 +33,36 @@ Inset * InsetMathBoldSymbol::clone() const
 }
 
 
+docstring InsetMathBoldSymbol::name() const
+{
+       switch (kind_) {
+       case AMS_BOLD:
+               return from_ascii("boldsymbol");
+       case BM_BOLD:
+               return from_ascii("bm");
+       case BM_HEAVY:
+               return from_ascii("hm");
+       }
+       // avoid compiler warning
+       return docstring();
+}
+
+
 void InsetMathBoldSymbol::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       //FontSetChanger dummy(mi.base, "mathbf");
+       Changer dummy = mi.base.changeEnsureMath();
+       //Changer dummy = mi.base.changeFontSet("mathbf");
        cell(0).metrics(mi, dim);
-       metricsMarkers(dim);
        ++dim.wid;  // for 'double stroke'
-       // Cache the inset dimension. 
-       setDimCache(mi, dim);
 }
 
 
 void InsetMathBoldSymbol::draw(PainterInfo & pi, int x, int y) const
 {
-       //FontSetChanger dummy(pi.base, "mathbf");
+       Changer dummy = pi.base.changeEnsureMath();
+       //Changer dummy = pi.base.changeFontSet("mathbf");
+       cell(0).draw(pi, x, y);
        cell(0).draw(pi, x + 1, y);
-       cell(0).draw(pi, x + 2, y);
-       drawMarkers(pi, x, y);
 }
 
 
@@ -69,19 +83,55 @@ void InsetMathBoldSymbol::drawT(TextPainter & pain, int x, int y) const
 void InsetMathBoldSymbol::validate(LaTeXFeatures & features) const
 {
        InsetMathNest::validate(features);
-       features.require("amssymb");
+       if (kind_ == AMS_BOLD)
+               features.require("amsbsy");
+       else
+               features.require("bm");
 }
 
 
 void InsetMathBoldSymbol::write(WriteStream & os) const
 {
-       os << "\\boldsymbol{" << cell(0) << "}";
+       MathEnsurer ensurer(os);
+       switch (kind_) {
+       case AMS_BOLD:
+               os << "\\boldsymbol{" << cell(0) << "}";
+               break;
+       case BM_BOLD:
+               os << "\\bm{" << cell(0) << "}";
+               break;
+       case BM_HEAVY:
+               os << "\\hm{" << cell(0) << "}";
+               break;
+       }
+}
+
+
+void InsetMathBoldSymbol::mathmlize(MathStream & os) const
+{
+       os << "<mstyle mathvariant='bold'>" << cell(0) << "</mstyle>";
+}
+
+
+void InsetMathBoldSymbol::htmlize(HtmlStream & os) const
+{
+       os << MTag("b") << cell(0) << ETag("b");
 }
 
 
 void InsetMathBoldSymbol::infoize(odocstream & os) const
 {
-       os << "Boldsymbol ";
+       switch (kind_) {
+       case AMS_BOLD:
+               os << "Boldsymbol ";
+               break;
+       case BM_BOLD:
+               os << "Boldsymbol (bm)";
+               break;
+       case BM_HEAVY:
+               os << "Heavysymbol (bm)";
+               break;
+       }
 }