multicol; small stuff

[lyx.git] / src / LaTeXFeatures.C

diff --git a/src/LaTeXFeatures.C b/src/LaTeXFeatures.C
index d9d53774a95a7c96e855bcf94ee94599d18b1c49..3fd615848002e728ae19946b1a33c2901dd1ebfb 100644 (file)
--- a/src/LaTeXFeatures.C
+++ b/src/LaTeXFeatures.C
@@ -10,10 +10,6 @@
 
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
 #include "LaTeXFeatures.h"
 #include "debug.h"
 #include "lyx_sty.h"
@@ -91,10 +87,7 @@ void LaTeXFeatures::useLayout(string const & layoutname)
 
 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();
 }
 
 
@@ -129,7 +122,7 @@ void LaTeXFeatures::includeFile(string const & key, string const & name)
 }
 
 
-bool LaTeXFeatures::hasLanguages()
+bool LaTeXFeatures::hasLanguages() const
 {
        return !UsedLanguages.empty();
 }
@@ -145,11 +138,11 @@ string LaTeXFeatures::getLanguages() const
             ++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 =
@@ -174,10 +167,11 @@ char const * simplefeatures[] = {
        "varioref",
        "prettyref",
        "float",
-       "wasy"
+       "wasy",
+       "dvipost"
 };
 
-const int nb_simplefeatures = sizeof(simplefeatures) / sizeof(char const *);
+int const nb_simplefeatures = sizeof(simplefeatures) / sizeof(char const *);
 
 }
 
@@ -210,10 +204,11 @@ string const LaTeXFeatures::getPackages() 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";
        }
 
@@ -289,7 +284,7 @@ string const LaTeXFeatures::getPackages() const
 
        packages << externalPreambles;
 
-       return packages.str().c_str();
+       return STRCONV(packages.str());
 }
 
 
@@ -346,7 +341,7 @@ string const LaTeXFeatures::getMacros() const
        // floats
        getFloatDefinitions(macros);
 
-       return macros.str().c_str();
+       return STRCONV(macros.str());
 }
 
 
@@ -361,7 +356,7 @@ string const LaTeXFeatures::getBabelOptions() const
        if (!params.language->latex_options().empty())
                tmp << params.language->latex_options() << '\n';
 
-       return tmp.str().c_str();
+       return STRCONV(tmp.str());
 }
 
 
@@ -379,7 +374,7 @@ string const LaTeXFeatures::getTClassPreamble() const
                tcpreamble << tclass[*cit]->preamble();
        }
 
-       return tcpreamble.str().c_str();
+       return STRCONV(tcpreamble.str());
 }
 
 
@@ -392,7 +387,7 @@ string const LaTeXFeatures::getLyXSGMLEntities() const
                entities << "<!ENTITY lyxarrow \"-&gt;\">" << '\n';
        }
 
-       return entities.str().c_str();
+       return STRCONV(entities.str());
 }
 
 
@@ -408,7 +403,7 @@ string const LaTeXFeatures::getIncludedFiles(string const & fname) const
                             << (IsSGMLFilename(fi->second) ? " SYSTEM \"" : " \"")
                             << MakeRelPath(fi->second, basename) << "\">";
 
-       return sgmlpreamble.str().c_str();
+       return STRCONV(sgmlpreamble.str());
 }
 
 
@@ -473,10 +468,10 @@ void LaTeXFeatures::getFloatDefinitions(ostream & os) const
                        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";