Fix small bug in reading \set_color in lyxrc

[lyx.git] / src / LaTeXFeatures.C

diff --git a/src/LaTeXFeatures.C b/src/LaTeXFeatures.C
index 72a0ea97371a750323d92b34de61f9174375dfad..c7172bfa5577ea7c6d09f4bd6c8f9bfd8e5bc766 100644 (file)
--- a/src/LaTeXFeatures.C
+++ b/src/LaTeXFeatures.C
@@ -29,6 +29,7 @@ LaTeXFeatures::LaTeXFeatures(BufferParams const & p, int n)
        : layout(n, false), params(p)
 {
        // packages
+       array = false;
        color = false;
        graphics = false;
        setspace = false;
@@ -43,6 +44,9 @@ LaTeXFeatures::LaTeXFeatures(BufferParams const & p, int n)
        subfigure = false;
        floatflt = false;
        url = false;
+       varioref = false;
+       prettyref = false;
+       chess = false;
        
        // commands
        lyx = false;
@@ -69,6 +73,55 @@ LaTeXFeatures::LaTeXFeatures(BufferParams const & p, int n)
        NeedLyXMinipageIndent = false;
 }
 
+void LaTeXFeatures::require(string const & name) {
+       if (name == "array") {
+               array = true;
+       } else if (name == "color") {
+               color = true;
+       } else if (name == "graphics") {
+#ifdef USE_GRAPHICX
+               graphicx = true;
+#else
+               graphics = true;
+#endif
+       } else if (name == "setspace") {
+               setspace = true;
+       } else if (name == "makeidx") {
+               makeidx = true;
+       } else if (name == "verbatim") {
+               verbatim = true;
+       } else if (name == "longtable") {
+               longtable = true;
+       } else if (name == "algorithm") {
+               algorithm = true;
+       } else if (name == "rotating") {
+               rotating = true;
+       } else if (name == "amssymb") {
+               amssymb = true;
+       } else if (name == "latexsym") {
+               latexsym = true;
+       } else if (name == "pifont") {
+               pifont = true;
+       } else if (name == "subfigure") {
+               subfigure = true;
+       } else if (name == "floatflt") {
+               floatflt = true;
+       } else if (name == "url") {
+               url = true;
+       } else if (name == "varioref") {
+               varioref = true;
+       } else if (name == "prettyref") {
+               prettyref = true;
+       } else if (name == "chess") {
+               chess = true;
+       } else if (name == "amsstyle") {
+               amsstyle = true;
+       } else if (name == "boldsymbol") {
+               boldsymbol = true;
+       } else if (name == "binom") {
+               binom = true;
+       }
+}
 
 string LaTeXFeatures::getPackages()
 {
@@ -76,6 +129,10 @@ string LaTeXFeatures::getPackages()
        LyXTextClass const & tclass =
                textclasslist.TextClass(params.textclass);
 
+       // array-package
+       if (array)
+               packages += "\\usepackage{array}\n";
+
        // color.sty
        if (color) {
                if (params.graphicsDriver == "default")
@@ -103,7 +160,7 @@ string LaTeXFeatures::getPackages()
                                + params.graphicsDriver + "]{graphics}\n";
        }
 
-       //verbatim.sty
+       // verbatim.sty
        if (verbatim)
                packages += "\\usepackage{verbatim}\n";
 
@@ -111,6 +168,11 @@ string LaTeXFeatures::getPackages()
                packages += "\\usepackage{algorithm}\n";
        }
 
+       // lyxchess.sty
+       if (chess) {
+               packages += "\\usepackage{lyxchess}\n";
+       }
+
        // setspace.sty
        if ((params.spacing.getSpace() != Spacing::Single
             && !params.spacing.isDefault())
@@ -181,7 +243,24 @@ string LaTeXFeatures::getPackages()
        if (url && ! tclass.provides(LyXTextClass::url))
                packages += "\\IfFileExists{url.sty}{\\usepackage{url}}\n"
                            "                      {\\newcommand{\\url}{\\texttt}}\n";
+
+       // varioref.sty
+       if (varioref)
+               packages += "\\usepackage{varioref}\n";
+
+       // prettyref.sty
+       if (prettyref)
+               packages += "\\usepackage{prettyref}\n";
+
+       // float.sty
+       // This is not correct and needs fixing.
+       // We don't need float.sty if we only use unchanged
+       // table and figure floats. (Lgb)
+       if (!usedFloats.empty())
+               packages += "\\usepackage{float}\n";
        
+       packages += externalPreambles;
+
        return packages;
 }
 
@@ -233,6 +312,12 @@ string LaTeXFeatures::getMacros()
         if (NeedLyXFootnoteCode) 
                macros += floatingfootnote_def;
 
+       // 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}
+       // \newfloat{algorithm}{htbp}{loa}
+       // \floatname{algorithm}{Algorithm}
        return macros;
 }
 
@@ -254,6 +339,17 @@ string LaTeXFeatures::getTClassPreamble()
 }      
 
 
+string LaTeXFeatures::getIncludedFiles()
+{
+       string sgmlpreamble;
+
+       for(FileMap::const_iterator fi=IncludedFiles.begin(); fi != IncludedFiles.end(); ++fi)
+               sgmlpreamble += "\n<!entity " + fi->first + " system \"" + fi->second + "\">";
+
+       return sgmlpreamble;
+}
+
+
 void LaTeXFeatures::showStruct() {
        lyxerr << "LyX needs the following commands when LaTeXing:"
               << "\n***** Packages:" << getPackages()