multicol; small stuff

[lyx.git] / src / LaTeXFeatures.C

diff --git a/src/LaTeXFeatures.C b/src/LaTeXFeatures.C
index b91ee8cbdb662ee0ed7821fa3f44faae6ed4a680..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();
 }
@@ -149,7 +142,7 @@ string LaTeXFeatures::getLanguages() const
 }
 
 
-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";
        }