using namespace std;
using namespace lyx::support;
+
namespace lyx {
/////////////////////////////////////////////////////////////////////
" \\def\\encodingdefault{T2A}}\n"
"\\DeclareRobustCommand{\\textcyr}[1]{\\leavevmode{\\cyrtext #1}}\n"
"\\DeclareFontEncoding{T2A}{}{}\n";
-
+
+static string const lyxmathsym_def =
+ "\\DeclareRobustCommand{\\lyxmathsym}[1]{%\n"
+ " \\ifmmode\\begingroup\n"
+ " \\edef\\b@ld{bold}%\n"
+ " \\def\\rmorbf##1{\\ifx\\math@version\\b@ld\\textbf{##1}\\else\\textrm{##1}\\fi}%\n"
+ " \\mathchoice{\\hbox{\\rmorbf{#1}}}{\\hbox{\\rmorbf{#1}}}%\n"
+ " {\\hbox{\\smaller[2]\\rmorbf{#1}}}{\\hbox{\\smaller[3]\\rmorbf{#1}}}%\n"
+ " \\endgroup\\else#1\\fi}\n";
+
/////////////////////////////////////////////////////////////////////
//
// LaTeXFeatures
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
"endnotes",
"ifthen",
"amsthm",
- "listings"
+ "listings",
+ "bm",
+ "pdfpages",
+ "relsize"
};
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";
"\\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();
}
if (mustProvide("textcyr"))
macros << textcyr_def << '\n';
+ if (mustProvide("lyxmathsym"))
+ macros << lyxmathsym_def << '\n';
+
// quotes.
if (mustProvide("quotesinglbase"))
macros << quotesinglbase_def << '\n';
}
-void LaTeXFeatures::showStruct() const {
+void LaTeXFeatures::showStruct() const
+{
lyxerr << "LyX needs the following commands when LaTeXing:"
<< "\n***** Packages:" << getPackages()
<< "\n***** Macros:" << getMacros()