#include <config.h>
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
#include "LaTeXFeatures.h"
#include "debug.h"
#include "lyx_sty.h"
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();
}
}
-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 =
"varioref",
"prettyref",
"float",
- "wasy"
+ "wasy",
+ "dvipost"
};
-const int nb_simplefeatures = sizeof(simplefeatures) / sizeof(char const *);
+int const nb_simplefeatures = sizeof(simplefeatures) / sizeof(char const *);
}
// 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());
}
// 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());
}
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());
}
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";