/* This file is part of
- * ======================================================
- *
+ * ======================================================
+ *
* LyX, The Document Processor
- *
+ *
* Copyright 1995 Matthias Ettrich
* Copyright 1995-2001 the LyX Team.
*
{
if (isRequired(name))
return;
-
+
features.push_back(name);
}
bool LaTeXFeatures::isRequired(string const & name) const
{
- FeaturesList::const_iterator i = find(features.begin(),
+ FeaturesList::const_iterator i = find(features.begin(),
features.end(),
name);
return i != features.end();
}
-void LaTeXFeatures::includeFile(string const & key, string const & name)
+void LaTeXFeatures::includeFile(string const & key, string const & name)
{
IncludedFiles[key] = name;
}
-bool LaTeXFeatures::hasLanguages()
+bool LaTeXFeatures::hasLanguages()
{
return !UsedLanguages.empty();
}
-string LaTeXFeatures::getLanguages() const
+string LaTeXFeatures::getLanguages() const
{
ostringstream languages;
for (LanguageList::const_iterator cit =
UsedLanguages.begin();
- cit != UsedLanguages.end();
+ cit != UsedLanguages.end();
++cit)
languages << (*cit)->babel() << ',';
}
-set<string> LaTeXFeatures::getEncodingSet(string const & doc_encoding)
+set<string> LaTeXFeatures::getEncodingSet(string const & doc_encoding)
{
set<string> encodings;
for (LanguageList::const_iterator it =
}
namespace {
-
+
char const * simplefeatures[] = {
"array",
"verbatim",
"floatflt",
"varioref",
"prettyref",
- "float"
+ "float",
+ "wasy"
};
const int nb_simplefeatures = sizeof(simplefeatures) / sizeof(char const *);
LyXTextClass const & tclass = textclasslist[params.textclass];
- /**
- * These are all the 'simple' includes. i.e
- * packages which we just \usepackage{package}
- **/
- for (int i = 0 ; i < nb_simplefeatures ; ++i) {
+ //
+ // These are all the 'simple' includes. i.e
+ // packages which we just \usepackage{package}
+ //
+ for (int i = 0; i < nb_simplefeatures; ++i) {
if (isRequired(simplefeatures[i]))
packages << "\\usepackage{"
- << simplefeatures[i]
- << "}\n";
+ << simplefeatures[i] << "}\n";
}
-
- /**
- * The rest of these packages are somewhat more complicated
- * than those above.
- **/
+
+ //
+ // The rest of these packages are somewhat more complicated
+ // than those above.
+ //
if (isRequired("amsmath")
&& ! tclass.provides(LyXTextClass::amsmath)) {
packages << "\\usepackage{amsmath}\n";
}
-
+
// color.sty
if (isRequired("color")) {
if (params.graphicsDriver == "default")
packages << "\\usepackage{color}\n";
else
- packages << "\\usepackage["
+ packages << "\\usepackage["
<< params.graphicsDriver
<< "]{color}\n";
}
-
+
// makeidx.sty
if (isRequired("makeidx")) {
if (! tclass.provides(LyXTextClass::makeidx))
if (params.graphicsDriver == "default")
packages << "\\usepackage{graphicx}\n";
else
- packages << "\\usepackage["
+ packages << "\\usepackage["
<< params.graphicsDriver
<< "]{graphicx}\n";
}
// float.sty
// natbib.sty
- if (isRequired("natbib")) {
+ if (isRequired("natbib") && ! tclass.provides(LyXTextClass::natbib)) {
packages << "\\usepackage[";
if (params.use_numerical_citations) {
packages << "numbers";
}
packages << "]{natbib}\n";
}
-
+
packages << externalPreambles;
return packages.str().c_str();
ostringstream macros;
// always include this
- if (true || isRequired("lyx"))
+ if (true || isRequired("lyx"))
macros << lyx_def << '\n';
- if (isRequired("lyxline"))
+ if (isRequired("lyxline"))
macros << lyxline_def << '\n';
if (isRequired("noun"))
if (isRequired("lyxarrow"))
macros << lyxarrow_def << '\n';
- // quotes.
+ // quotes.
if (isRequired("quotesinglbase"))
macros << quotesinglbase_def << '\n';
if (isRequired("quotedblbase"))
macros << guillemotleft_def << '\n';
if (isRequired("guillemotright"))
macros << guillemotright_def << '\n';
-
- // Math mode
+
+ // Math mode
if (isRequired("boldsymbol") && !isRequired("amsmath"))
macros << boldsymbol_def << '\n';
if (isRequired("binom") && !isRequired("amsmath"))
macros << binom_def << '\n';
+ if (isRequired("mathcircumflex"))
+ macros << mathcircumflex_def << '\n';
// other
if (isRequired("NeedLyXMinipageIndent"))
macros << minipageindent_def;
- if (isRequired("ParagraphIndent"))
- macros << paragraphindent_def;
- if (isRequired("NeedLyXFootnoteCode"))
+ if (isRequired("ParagraphLeftIndent"))
+ macros << paragraphleftindent_def;
+ if (isRequired("NeedLyXFootnoteCode"))
macros << floatingfootnote_def;
// floats
getFloatDefinitions(macros);
+ return macros.str().c_str();
+}
+
+
+string const LaTeXFeatures::getBabelOptions() const
+{
+ ostringstream tmp;
+
for (LanguageList::const_iterator cit = UsedLanguages.begin();
cit != UsedLanguages.end(); ++cit)
if (!(*cit)->latex_options().empty())
- macros << (*cit)->latex_options() << '\n';
+ tmp << (*cit)->latex_options() << '\n';
if (!params.language->latex_options().empty())
- macros << params.language->latex_options() << '\n';
+ tmp << params.language->latex_options() << '\n';
- return macros.str().c_str();
+ return tmp.str().c_str();
}
string const LaTeXFeatures::getTClassPreamble() const
{
- // the text class specific preamble
+ // the text class specific preamble
LyXTextClass const & tclass = textclasslist[params.textclass];
ostringstream tcpreamble;
set<string>::const_iterator cit = layout.begin();
set<string>::const_iterator end = layout.end();
for (; cit != end; ++cit) {
- tcpreamble << tclass[*cit].preamble();
+ tcpreamble << tclass[*cit]->preamble();
}
-
+
return tcpreamble.str().c_str();
-}
+}
string const LaTeXFeatures::getLyXSGMLEntities() const
// ostringstream floats;
for (; cit != end; ++cit) {
Floating const & fl = floatList.getType((*cit));
-
+
// For builtin floats we do nothing.
if (fl.builtin()) continue;
-
+
// We have to special case "table" and "figure"
if (fl.type() == "tabular" || fl.type() == "figure") {
// Output code to modify "table" or "figure"
}
} else {
// The other non builtin floats.
-
+
string const type = fl.type();
string const placement = fl.placement();
string const ext = fl.ext();
os << "\n"
<< "\\floatname{" << type << "}{"
<< name << "}\n";
-
+
// What missing here is to code to minimalize the code
// output so that the same floatstyle will not be
// used several times, when the same style is still in