Update the description of the bm package in LaTeXConfig.lyx.

Also make sure that bm is loaded after amsmath.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23706 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/lib/doc/LaTeXConfig.lyx b/lib/doc/LaTeXConfig.lyx
index d1b61744138556183fb78cf3688c59287dcfa781..08e752c3a566d43f100fc5753ef13879fcd854d4 100644 (file)
--- a/lib/doc/LaTeXConfig.lyx
+++ b/lib/doc/LaTeXConfig.lyx
@@ -1,4 +1,4 @@
-#LyX 1.6svn created this file. For more info see http://www.lyx.org/
+#LyX 1.6.0svn created this file. For more info see http://www.lyx.org/
 \lyxformat 318
 \begin_document
 \begin_header
@@ -3278,7 +3278,7 @@ arg   "bm"
 \begin_layout Description
 CTAN: 
 \family typewriter
-macros/latex/required/tools
+macros/latex/required/tools/
 \end_layout
 
 \begin_layout Description
@@ -3286,31 +3286,49 @@ Notes: The
 \family sans
 bm
 \family default
- package defines a command 
+ package defines commands to access bold math symbols.
+ The basic command is 
 \family typewriter
 
 \backslash
 bm
 \family default
- which makes its argument bold.
- The argument may be any maths object from a single symbol to an expression.
- This is closely related to the specification of the 
+ (aliased to 
 \family typewriter
 
 \backslash
 boldsymbol
 \family default
- 
-\family sans
-amsbsy
+) which makes its argument bold.
+ The argument may be any math object from a single symbol to an expression.
+ If available, ultra bold fonts can be accesed through the 
+\family typewriter
+
+\backslash
+hm
 \family default
- command in AMS-LaTeX, but 
+ command (aliased to 
 \family typewriter
 
 \backslash
+heavysymbol
+\family default
+).
+ The 
+\family typewriter
+
+\backslash
+boldsymbol
+\family default
+ command is similar to the 
+\family sans
+amsmath
+\family default
+ command with same name, but the 
+\family sans
 bm
 \family default
- is rather more careful in the way it does things.
+ version is rather more careful in the way it does things.
 \end_layout
 
 \begin_layout Subsection

diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index 4b47083660359ab38ce85ebee0c489465a26ed3f..89c3bde81948d8df9cd41fbf295fd172a1d8325d 100644 (file)
--- a/src/LaTeXFeatures.cpp
+++ b/src/LaTeXFeatures.cpp
@@ -448,8 +448,7 @@ char const * simplefeatures[] = {
        "endnotes",
        "ifthen",
        "amsthm",
-       "listings",
-       "bm"
+       "listings"
 };
 
 int const nb_simplefeatures = sizeof(simplefeatures) / sizeof(char const *);
@@ -612,6 +611,12 @@ string const LaTeXFeatures::getPackages() const
                            "\\makenomenclature\n";
        }
 
+       // bm -- this package interrogates the font allocations to determine
+       // which bold fonts are available, so it is best loaded as the last one,
+       // and, in any case, after amsmath.
+       if (mustProvide("bm"))
+               packages << "\\usepackage{bm}\n";
+
        return packages.str();
 }