Re: [Cvslog] r23608 - /lyx-devel/trunk/src/mathed/InsetMathNest.cpp

[Enrico Forestieri]

On Mon, Mar 10, 2008 at 03:43:05AM +0100, Enrico Forestieri wrote:

> I think that this is not acceptable and propose the attached patch,
> such that \bm is used for bold math. In this way, the output remains
> the same independently from the fact that the amsmath package is
> loaded or not, sub and superscripts have the correct size, and bug 499
> remains fixed.

The attached patch is better, IMO. There's no reason to require
the \boldsymbol definition every time a math inset is used.

-- 
Enrico

Index: src/mathed/InsetMathHull.cpp
===================================================================
--- src/mathed/InsetMathHull.cpp        (revision 23611)
+++ src/mathed/InsetMathHull.cpp        (working copy)
@@ -570,7 +570,6 @@ void InsetMathHull::validate(LaTeXFeatur
        //if (features.amsstyle)
        //  return;
 
-       features.require("boldsymbol");
        //features.binom      = true;
 
        InsetMathGrid::validate(features);
Index: src/mathed/InsetMathNest.cpp
===================================================================
--- src/mathed/InsetMathNest.cpp        (revision 23611)
+++ src/mathed/InsetMathNest.cpp        (working copy)
@@ -808,7 +808,7 @@ void InsetMathNest::doDispatch(Cursor & 
                if (currentMode() == TEXT_MODE)
                        handleFont(cur, cmd.argument(), "textbf");
                else
-                       handleFont(cur, cmd.argument(), "boldsymbol");
+                       handleFont(cur, cmd.argument(), "bm");
                break;
        case LFUN_FONT_SANS:
                if (currentMode() == TEXT_MODE)
Index: src/mathed/InsetMathBoldSymbol.cpp
===================================================================
--- src/mathed/InsetMathBoldSymbol.cpp  (revision 23611)
+++ src/mathed/InsetMathBoldSymbol.cpp  (working copy)
@@ -67,6 +67,7 @@ void InsetMathBoldSymbol::drawT(TextPain
 void InsetMathBoldSymbol::validate(LaTeXFeatures & features) const
 {
        InsetMathNest::validate(features);
+       features.require("boldsymbol");
        features.require("amssymb");
 }
 
Index: src/LaTeXFeatures.cpp
===================================================================
--- src/LaTeXFeatures.cpp       (revision 23611)
+++ src/LaTeXFeatures.cpp       (working copy)
@@ -754,7 +754,7 @@ string const LaTeXFeatures::getMacros() 
                macros << guillemotright_def << '\n';
 
        // Math mode
-       if (mustProvide("boldsymbol") && !isRequired("amsmath"))
+       if (mustProvide("boldsymbol") && !(isRequired("amsmath") || 
isRequired("bm")))
                macros << boldsymbol_def << '\n';
        if (mustProvide("binom") && !isRequired("amsmath"))
                macros << binom_def << '\n';