Fix bug 5802 (http://bugzilla.lyx.org/show_bug.cgi?id=5802)

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

diff --git a/src/mathed/MathSupport.cpp b/src/mathed/MathSupport.cpp
index 977e765e9ad2e59eeaae5476a344c458ec03a74e..5b08f70bd41abdbec3d1a51d0170915464bcdeb7 100644 (file)
--- a/src/mathed/MathSupport.cpp
+++ b/src/mathed/MathSupport.cpp
@@ -4,7 +4,7 @@
  * Licence details can be found in the file COPYING.
  *
  * \author Alejandro Aguilar Sierra
- * \author André Pönitz
+ * \author André Pönitz
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -517,7 +517,7 @@ fontinfo fontinfos[] = {
        // math fonts
        {"mathnormal",    ROMAN_FAMILY, MEDIUM_SERIES,
                          ITALIC_SHAPE, Color_math},
-       {"boldsymbol",    inh_family, BOLD_SERIES,
+       {"mathbf",        inh_family, BOLD_SERIES,
                          inh_shape, Color_math},
        {"mathcal",       CMSY_FAMILY, inh_series,
                          inh_shape, Color_math},
@@ -685,9 +685,11 @@ docstring asString(MathData const & ar)
 }
 
 
-void asArray(docstring const & str, MathData & ar)
+void asArray(docstring const & str, MathData & ar, Parse::flags pf)
 {
-       mathed_parse_cell(ar, str);
+       bool quiet = pf & Parse::QUIET;
+       if ((str.size() == 1 && quiet) || (!mathed_parse_cell(ar, str, pf) && quiet))
+               mathed_parse_cell(ar, str, pf | Parse::VERBATIM);
 }