using namespace std;
using namespace lyx::support;
+
namespace lyx {
/////////////////////////////////////////////////////////////////////
" \\expandafter\\noexpand\\csname SF@gobble@opt \\endcsname}\n"
"\\def\\SF@gobble@twobracket[#1]#2{}\n";
-static string const boldsymbol_def =
- "%% Bold symbol macro for standard LaTeX users\n"
- "\\providecommand{\\boldsymbol}[1]{\\mbox{\\boldmath $#1$}}\n";
-
static string const binom_def =
"%% Binom macro for standard LaTeX users\n"
"\\newcommand{\\binom}[2]{{#1 \\choose #2}}\n";
void LaTeXFeatures::getAvailable()
{
- Lexer lex(0, 0);
+ Lexer lex;
support::FileName const real_file = libFileSearch("", "packages.lst");
if (real_file.empty())
"rotating",
"latexsym",
"pifont",
- "subfig",
+ // subfig is handled in BufferParams.cpp
"varioref",
"prettyref",
/*For a successful cooperation of the `wrapfig' package with the
"ifthen",
"amsthm",
"listings",
- "bm"
+ "bm",
+ "pdfpages"
};
int const nb_simplefeatures = sizeof(simplefeatures) / sizeof(char const *);
(mustProvide("esintoramsmath") &&
params_.use_esint == BufferParams::package_off)) {
packages << "\\usepackage{amsmath}\n";
+ } else if (mustProvide("amsbsy")) {
+ // amsbsy is already provided by amsmath
+ packages << "\\usepackage{amsbsy}\n";
}
// wasysym is a simple feature, but it must be after amsmath if both
}
// pdfcolmk must be loaded after color
- if (mustProvide("pdfcolmk")) {
+ if (mustProvide("pdfcolmk"))
packages << "\\usepackage{pdfcolmk}\n";
- }
// makeidx.sty
if (isRequired("makeidx")) {
}
// lyxskak.sty --- newer chess support based on skak.sty
- if (mustProvide("chess")) {
+ if (mustProvide("chess"))
packages << "\\usepackage[ps,mover]{lyxskak}\n";
- }
// setspace.sty
if (mustProvide("setspace") && !tclass.provides("SetSpace"))
- packages << "\\usepackage{setspace}\n";
+ packages << "\\usepackage{setspace}\n";
// amssymb.sty
if (mustProvide("amssymb")
// natbib.sty
if (mustProvide("natbib")) {
packages << "\\usepackage[";
- if (params_.getEngine() == biblio::ENGINE_NATBIB_NUMERICAL) {
+ if (params_.citeEngine() == ENGINE_NATBIB_NUMERICAL)
packages << "numbers";
- } else {
+ else
packages << "authoryear";
- }
packages << "]{natbib}\n";
}
// jurabib -- we need version 0.6 at least.
- if (mustProvide("jurabib")) {
+ if (mustProvide("jurabib"))
packages << "\\usepackage{jurabib}[2004/01/25]\n";
- }
// xargs -- we need version 1.09 at least
- if (mustProvide("xargs")) {
+ if (mustProvide("xargs"))
packages << "\\usepackage{xargs}[2008/03/08]\n";
- }
// bibtopic -- the dot provides the aux file naming which
// LyX can detect.
- if (mustProvide("bibtopic")) {
+ if (mustProvide("bibtopic"))
packages << "\\usepackage[dot]{bibtopic}\n";
- }
if (mustProvide("xy"))
packages << "\\usepackage[all]{xy}\n";
macros << guillemotright_def << '\n';
// Math mode
- if (mustProvide("boldsymbol") && !isRequired("amsmath"))
- macros << boldsymbol_def << '\n';
if (mustProvide("binom") && !isRequired("amsmath"))
macros << binom_def << '\n';
if (mustProvide("mathcircumflex"))
}
-void LaTeXFeatures::showStruct() const {
+void LaTeXFeatures::showStruct() const
+{
lyxerr << "LyX needs the following commands when LaTeXing:"
<< "\n***** Packages:" << getPackages()
<< "\n***** Macros:" << getMacros()