#include <config.h>
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
#include "LaTeXFeatures.h"
#include "debug.h"
#include "lyx_sty.h"
#include "lyxrc.h"
#include "bufferparams.h"
-#include "lyxtextclasslist.h"
#include "FloatList.h"
#include "language.h"
#include "encoding.h"
using lyx::textclass_type;
using std::endl;
+using std::list;
using std::set;
-using std::vector;
using std::find;
using std::ostream;
}
-void LaTeXFeatures::useLayout(string const & lyt)
+void LaTeXFeatures::useLayout(string const & layoutname)
{
- layout.insert(lyt);
+ // 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 = find(features.begin(),
- features.end(),
- name);
- return i != features.end();
+ return find(features.begin(), features.end(), name) != 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");
}
}
-bool LaTeXFeatures::hasLanguages()
+bool LaTeXFeatures::hasLanguages() const
{
return !UsedLanguages.empty();
}
++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) const
{
set<string> encodings;
for (LanguageList::const_iterator it =
"floatflt",
"varioref",
"prettyref",
- "float"
+ "float",
+ "wasy",
+ "dvipost"
};
-const int nb_simplefeatures = sizeof(simplefeatures) / sizeof(char const *);
+int const nb_simplefeatures = sizeof(simplefeatures) / sizeof(char const *);
}
string const LaTeXFeatures::getPackages() const
{
ostringstream packages;
- LyXTextClass const & tclass = textclasslist[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)) {
// color.sty
if (isRequired("color")) {
if (params.graphicsDriver == "default")
- packages << "\\usepackage{color}\n";
+ packages << "\\usepackage[usenames]{color}\n";
else
packages << "\\usepackage["
<< params.graphicsDriver
+ << ",usenames"
<< "]{color}\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("NeedLyXFootnoteCode"))
macros << floatingfootnote_def;
+ // some problems with tex->html converters
+ if (isRequired("NeedTabularnewline"))
+ macros << tabularnewline_def;
+
// floats
getFloatDefinitions(macros);
- return macros.str().c_str();
+ return STRCONV(macros.str());
}
if (!params.language->latex_options().empty())
tmp << params.language->latex_options() << '\n';
- return tmp.str().c_str();
+ return STRCONV(tmp.str());
}
string const LaTeXFeatures::getTClassPreamble() const
{
// the text class specific preamble
- LyXTextClass const & tclass = textclasslist[params.textclass];
+ LyXTextClass const & tclass = params.getLyXTextClass();
ostringstream tcpreamble;
tcpreamble << tclass.preamble();
- set<string>::const_iterator cit = layout.begin();
- set<string>::const_iterator end = layout.end();
+ list<string>::const_iterator cit = usedLayouts.begin();
+ list<string>::const_iterator end = usedLayouts.end();
for (; cit != end; ++cit) {
- tcpreamble << tclass[*cit].preamble();
+ tcpreamble << tclass[*cit]->preamble();
}
- return tcpreamble.str().c_str();
+ return STRCONV(tcpreamble.str());
}
entities << "<!ENTITY lyxarrow \"->\">" << '\n';
}
- return entities.str().c_str();
+ return STRCONV(entities.str());
}
<< (IsSGMLFilename(fi->second) ? " SYSTEM \"" : " \"")
<< MakeRelPath(fi->second, basename) << "\">";
- return sgmlpreamble.str().c_str();
+ return STRCONV(sgmlpreamble.str());
}
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;
string const name = fl.name();
os << "\\floatstyle{" << style << "}\n"
<< "\\newfloat{" << type << "}{" << placement
- << "}{" << ext << "}";
+ << "}{" << ext << '}';
if (!within.empty())
- os << "[" << within << "]";
- os << "\n"
+ os << '[' << within << ']';
+ os << '\n'
<< "\\floatname{" << type << "}{"
<< name << "}\n";
projects / lyx.git / blobdiff