/* This file is part of
- * ======================================================
- *
+ * ======================================================
+ *
* LyX, The Document Processor
- *
+ *
* Copyright 1995 Matthias Ettrich
* Copyright 1995-2001 the LyX Team.
*
#include "lyx_sty.h"
#include "lyxrc.h"
#include "bufferparams.h"
-#include "lyxtextclasslist.h"
#include "FloatList.h"
#include "language.h"
#include "encoding.h"
#include "support/filetools.h"
#include "support/lstrings.h"
-using lyx::layout_type;
using lyx::textclass_type;
using std::endl;
+using std::list;
using std::set;
+using std::find;
+using std::ostream;
+
-LaTeXFeatures::LaTeXFeatures(BufferParams const & p, layout_type n)
- : layout(n, false), params(p)
+LaTeXFeatures::LaTeXFeatures(BufferParams const & p)
+ : params(p)
{}
{
if (isRequired(name))
return;
-
- // INSET_GRAPHICS: remove this when InsetFig is thrown.
- if (name == "graphics") {
- features.push_back("graphicx");
- features.push_back("graphics");
- } else
- features.push_back(name);
+
+ features.push_back(name);
}
-void LaTeXFeatures::useLayout(std::vector<bool>::size_type const & idx)
+void LaTeXFeatures::useLayout(string const & layoutname)
{
- layout[idx] = true;
+ // Some code to avoid loops in dependency definition
+ static int level = 0;
+ const int maxlevel = 30;
+ if (level > maxlevel) {
+ lyxerr << "LaTeXFeatures::useLayout: maximum level of "
+ << "recursion attained by layout "
+ << layoutname << endl;
+ return;
+ }
+
+ LyXTextClass const & tclass = params.getLyXTextClass();
+ if (tclass.hasLayout(layoutname)) {
+ // Is this layout already in usedLayouts?
+ list<string>::const_iterator cit = usedLayouts.begin();
+ list<string>::const_iterator end = usedLayouts.end();
+ for (; cit != end; ++cit) {
+ if (layoutname == *cit)
+ return;
+ }
+
+ LyXLayout_ptr const & lyt = tclass[layoutname];
+ if (!lyt->depends_on().empty()) {
+ ++level;
+ useLayout(lyt->depends_on());
+ --level;
+ }
+ usedLayouts.push_back(layoutname);
+ } else {
+ lyxerr << "LaTeXFeatures::useLayout: layout `"
+ << layoutname << "' does not exist in this class"
+ << endl;
+ }
+
+ --level;
}
bool LaTeXFeatures::isRequired(string const & name) const
{
- FeaturesList::const_iterator i = std::find(features.begin(),
- features.end(),
- name);
+ FeaturesList::const_iterator i = find(features.begin(),
+ features.end(),
+ name);
return i != features.end();
}
// We only need float.sty if we use non builtin floats, or if we
// use the "H" modifier. This includes modified table and
// figure floats. (Lgb)
- Floating const & fl = floatList.getType(name);
+ Floating const & fl = params.getLyXTextClass().floats().getType(name);
if (!fl.type().empty() && !fl.builtin()) {
require("float");
}
}
-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() << ',';
- return languages.str().c_str();
+ return STRCONV(languages.str());
}
-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 *);
string const LaTeXFeatures::getPackages() const
{
ostringstream packages;
- LyXTextClass const & tclass =
- textclasslist.TextClass(params.textclass);
+ LyXTextClass const & tclass = params.getLyXTextClass();
- /**
- * 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";
}
- // INSET_GRAPHICS: remove this when InsetFig is thrown.
- // graphics.sty
- if (isRequired("graphics") && params.graphicsDriver != "none") {
- if (params.graphicsDriver == "default")
- packages << "\\usepackage{graphics}\n";
- else
- packages << "\\usepackage["
- << params.graphicsDriver
- << "]{graphics}\n";
- }
-
//if (algorithm) {
// packages << "\\usepackage{algorithm}\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();
+ return STRCONV(packages.str());
}
{
ostringstream macros;
- // always include this
- if (true || isRequired("lyx"))
+ if (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;
+ // some problems with tex->html converters
+ if (isRequired("NeedTabularnewline"))
+ macros << tabularnewline_def;
+
// floats
getFloatDefinitions(macros);
+ return STRCONV(macros.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 STRCONV(tmp.str());
}
string const LaTeXFeatures::getTClassPreamble() const
{
- // the text class specific preamble
- LyXTextClass const & tclass = textclasslist.TextClass(params.textclass);
+ // the text class specific preamble
+ LyXTextClass const & tclass = params.getLyXTextClass();
ostringstream tcpreamble;
tcpreamble << tclass.preamble();
- for (layout_type i = 0; i < tclass.numLayouts(); ++i) {
- if (layout[i]) {
- tcpreamble << tclass[i].preamble();
- }
+ list<string>::const_iterator cit = usedLayouts.begin();
+ list<string>::const_iterator end = usedLayouts.end();
+ for (; cit != end; ++cit) {
+ tcpreamble << tclass[*cit]->preamble();
}
- return tcpreamble.str().c_str();
-}
+ return STRCONV(tcpreamble.str());
+}
string const LaTeXFeatures::getLyXSGMLEntities() const
entities << "<!ENTITY lyxarrow \"->\">" << '\n';
}
- return entities.str().c_str();
+ return STRCONV(entities.str());
}
for (FileMap::const_iterator fi = IncludedFiles.begin();
fi != end; ++fi)
sgmlpreamble << "\n<!ENTITY " << fi->first
- << (IsSGMLFilename(fi->second) ? " SYSTEM \"" : " \"" )
+ << (IsSGMLFilename(fi->second) ? " SYSTEM \"" : " \"")
<< MakeRelPath(fi->second, basename) << "\">";
- return sgmlpreamble.str().c_str();
+ return STRCONV(sgmlpreamble.str());
}
return params;
}
-void LaTeXFeatures::getFloatDefinitions(std::ostream & os) const
+
+void LaTeXFeatures::getFloatDefinitions(ostream & os) const
{
+ FloatList const & floats = params.getLyXTextClass().floats();
+
// Here we will output the code to create the needed float styles.
// We will try to do this as minimal as possible.
// \floatstyle{ruled}
UsedFloats::const_iterator end = usedFloats.end();
// ostringstream floats;
for (; cit != end; ++cit) {
- Floating const & fl = floatList.getType((*cit));
-
+ Floating const & fl = floats.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
projects / lyx.git / blobdiff