* This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING.
*
- * \author José Matos
- * \author Lars Gullik Bjønnes
+ * \author José Matos
+ * \author Lars Gullik Bjønnes
* \author Jean-Marc Lasgouttes
- * \author Jürgen Vigna
- * \author André Pönitz
+ * \author Jürgen Vigna
+ * \author André Pönitz
*
* Full author contact details are available in file CREDITS.
*/
#include "LaTeXFeatures.h"
-#include "Color.h"
+#include "Buffer.h"
#include "BufferParams.h"
+#include "ColorSet.h"
#include "Encoding.h"
#include "Floating.h"
#include "FloatList.h"
static string const noun_def = "\\newcommand{\\noun}[1]{\\textsc{#1}}";
static string const lyxarrow_def =
- "\\newcommand{\\lyxarrow}{\\leavevmode\\,$\\triangleright$\\,\\allowbreak}";
+ "\\DeclareRobustCommand*{\\lyxarrow}{%\n"
+ "\\@ifstar\n"
+ "{\\leavevmode\\,$\\triangleleft$\\,\\allowbreak}\n"
+ "{\\leavevmode\\,$\\triangleright$\\,\\allowbreak}}";
// for quotes without babel. This does not give perfect results, but
// anybody serious about non-english quotes should use babel (JMarc).
"\\newcommand{\\lyxdeleted}[3]{%\n"
"\\changestart\\overstrikeon#3\\overstrikeoff\\changeend}\n";
-static string const changetracking_xcolor_soul_def =
- "%% Change tracking with soul\n"
+static string const changetracking_xcolor_ulem_def =
+ "%% Change tracking with ulem\n"
"\\newcommand{\\lyxadded}[3]{{\\color{lyxadded}#3}}\n"
- "\\newcommand{\\lyxdeleted}[3]{{\\color{lyxdeleted}\\st{#3}}}\n";
+ "\\newcommand{\\lyxdeleted}[3]{{\\color{lyxdeleted}\\sout{#3}}}\n";
-static string const changetracking_xcolor_soul_hyperref_def =
- "%% Change tracking with soul\n"
+static string const changetracking_xcolor_ulem_hyperref_def =
+ "%% Change tracking with ulem\n"
"\\newcommand{\\lyxadded}[3]{{\\texorpdfstring{\\color{lyxadded}}{}#3}}\n"
- "\\newcommand{\\lyxdeleted}[3]{{\\texorpdfstring{\\color{lyxdeleted}\\st{#3}}{}}}\n";
+ "\\newcommand{\\lyxdeleted}[3]{{\\texorpdfstring{\\color{lyxdeleted}\\sout{#3}}{}}}\n";
static string const changetracking_none_def =
"\\newcommand{\\lyxadded}[3]{#3}\n"
"\\AtBeginDocument{\\DeclareFontEncoding{T2A}{}{}}\n";
static string const lyxmathsym_def =
- "\\DeclareRobustCommand{\\lyxmathsym}[1]{\\ifmmode\\begingroup\\def\\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";
+ "\\newcommand{\\lyxmathsym}{\\@ifstar{\\lyxm@thsym\\textit}{\\lyxm@thsym\\textrm}}\n"
+ "\\newcommand{\\lyxm@thsym}[2]{\\ifmmode\\begingroup\\def\\b@ld{bold}\n"
+ " #1{\\ifx\\math@version\\b@ld\\bfseries\\fi#2}\\endgroup\\else#2\\fi}\n";
static string const papersizedvi_def =
"\\special{papersize=\\the\\paperwidth,\\the\\paperheight}\n";
LaTeXFeatures::LaTeXFeatures(Buffer const & b, BufferParams const & p,
OutputParams const & r)
- : buffer_(&b), params_(p), runparams_(r)
+ : buffer_(&b), params_(p), runparams_(r), in_float_(false)
{}
// listings is handled in BufferParams.cpp
"bm",
"pdfpages",
- "relsize",
"amscd",
"slashed"
};
//
// esint is preferred for esintoramsmath
- if ((mustProvide("amsmath") &&
- params_.use_amsmath != BufferParams::package_off) ||
- (mustProvide("esintoramsmath") &&
- params_.use_esint == BufferParams::package_off)) {
+ if ((mustProvide("amsmath")
+ && params_.use_amsmath != BufferParams::package_off)
+ || (mustProvide("esintoramsmath")
+ && params_.use_esint == BufferParams::package_off
+ && params_.use_amsmath != BufferParams::package_off)) {
packages << "\\usepackage{amsmath}\n";
- } else if (mustProvide("amsbsy")) {
- // amsbsy is already provided by amsmath
- packages << "\\usepackage{amsbsy}\n";
+ } else {
+ // amsbsy and amstext are already provided by amsmath
+ if (mustProvide("amsbsy"))
+ packages << "\\usepackage{amsbsy}\n";
+ if (mustProvide("amstext"))
+ packages << "\\usepackage{amstext}\n";
}
// wasysym is a simple feature, but it must be after amsmath if both
if (isRequired("framed") && mustProvide("color")) {
RGBColor c = rgbFromHexName(lcolor.getX11Name(Color_shadedbg));
//255.0 to force conversion to double
- //NOTE As Jürgen Spitzmüller pointed out, an alternative would be
+ //NOTE As Jürgen Spitzmüller pointed out, an alternative would be
//to use the xcolor package instead, and then we can do
// \define{shadcolor}{RGB}...
//and not do any conversion. We'd then need to require xcolor
if (mustProvide("xy"))
packages << "\\usepackage[all]{xy}\n";
+ if (mustProvide("ulem"))
+ packages << "\\PassOptionsToPackage{normalem}{ulem}\n"
+ "\\usepackage{ulem}\n";
+
if (mustProvide("nomencl")) {
// Make it work with the new and old version of the package,
// but don't use the compatibility option since it is
for (; pit != pend; ++pit)
macros << *pit << '\n';
- if (mustProvide("papersize"))
+ if (mustProvide("papersize")) {
if (runparams_.flavor == OutputParams::LATEX)
macros << papersizedvi_def << '\n';
else
macros << papersizepdf_def << '\n';
+ }
if (mustProvide("LyX"))
macros << lyx_def << '\n';
if (mustProvide("ct-dvipost"))
macros << changetracking_dvipost_def;
- if (mustProvide("ct-xcolor-soul")) {
+ if (mustProvide("ct-xcolor-ulem")) {
int const prec = macros.precision(2);
RGBColor cadd = rgbFromHexName(lcolor.getX11Name(Color_addedtext));
macros.precision(prec);
if (isRequired("hyperref"))
- macros << changetracking_xcolor_soul_hyperref_def;
+ macros << changetracking_xcolor_ulem_hyperref_def;
else
- macros << changetracking_xcolor_soul_def;
+ macros << changetracking_xcolor_ulem_def;
}
if (mustProvide("ct-none"))
list<docstring>::const_iterator cit = usedLayouts_.begin();
list<docstring>::const_iterator end = usedLayouts_.end();
- for (; cit != end; ++cit) {
+ for (; cit != end; ++cit)
tcpreamble << tclass[*cit].preamble();
+
+ return tcpreamble.str();
+}
+
+
+docstring const LaTeXFeatures::getTClassI18nPreamble(bool use_babel) const
+{
+ DocumentClass const & tclass = params_.documentClass();
+ // collect preamble snippets in a set to prevent multiple identical
+ // commands (would happen if e.g. both theorem and theorem* are used)
+ set<docstring> snippets;
+ typedef LanguageList::const_iterator lang_it;
+ lang_it const lbeg = UsedLanguages_.begin();
+ lang_it const lend = UsedLanguages_.end();
+ list<docstring>::const_iterator cit = usedLayouts_.begin();
+ list<docstring>::const_iterator end = usedLayouts_.end();
+ for (; cit != end; ++cit) {
+ // language dependent commands (once per document)
+ snippets.insert(tclass[*cit].langpreamble(buffer().language()));
+ // commands for language changing (for multilanguage documents)
+ if (use_babel && !UsedLanguages_.empty()) {
+ snippets.insert(tclass[*cit].babelpreamble(buffer().language()));
+ for (lang_it lit = lbeg; lit != lend; ++lit)
+ snippets.insert(tclass[*cit].babelpreamble(*lit));
+ }
}
+ odocstringstream tcpreamble;
+ set<docstring>::const_iterator const send = snippets.end();
+ set<docstring>::const_iterator it = snippets.begin();
+ for (; it != send; ++it)
+ tcpreamble << *it;
return tcpreamble.str();
}
projects / lyx.git / blobdiff