]> git.lyx.org Git - lyx.git/blobdiff - src/LaTeXFeatures.C
fix typo that put too many include paths for most people
[lyx.git] / src / LaTeXFeatures.C
index f208c53590933dc21cb00b343453f01601636479..418f0b00ee93a359ede077a80459333ad325c2a9 100644 (file)
@@ -1,8 +1,8 @@
 /* This file is part of
- * ====================================================== 
- * 
+ * ======================================================
+ *
  *           LyX, The Document Processor
- *        
+ *
  *           Copyright 1995 Matthias Ettrich
  *           Copyright 1995-2001 the LyX Team.
  *
 #include <config.h>
 
 #ifdef __GNUG__
-#pragma implementation "LaTeXFeatures.h"
+#pragma implementation
 #endif
 
-#include "LString.h"
+#include "LaTeXFeatures.h"
 #include "debug.h"
 #include "lyx_sty.h"
 #include "lyxrc.h"
-#include "LaTeXFeatures.h"
 #include "bufferparams.h"
-#include "layout.h"
-#include "support/filetools.h"
-#include "support/lstrings.h"
+#include "lyxtextclasslist.h"
 #include "FloatList.h"
 #include "language.h"
 #include "encoding.h"
+#include "LString.h"
+
+#include "support/filetools.h"
+#include "support/lstrings.h"
+
+using lyx::textclass_type;
 
 using std::endl;
 using std::set;
+using std::vector;
+using std::find;
+using std::ostream;
 
-LaTeXFeatures::LaTeXFeatures(BufferParams const & p, LyXTextClass::size_type n)
-       : layout(n, false), params(p)
-{
-       
-}
+
+LaTeXFeatures::LaTeXFeatures(BufferParams const & p)
+       : params(p)
+{}
 
 
 void LaTeXFeatures::require(string const & name)
 {
-       // INSET_GRAPHICS: remove this when InsetFig is thrown.
-       if (name == "graphics") {
-               features.push_back("graphicx");
-               features.push_back("graphics");
-       } else
-               features.push_back(name);
+       if (isRequired(name))
+               return;
 
+       features.push_back(name);
 }
 
-void LaTeXFeatures::useLayout(std::vector<bool>::size_type const & idx)
+
+void LaTeXFeatures::useLayout(string const & lyt)
 {
-       layout[idx] = true;
+       layout.insert(lyt);
 }
 
+
 bool LaTeXFeatures::isRequired(string const & name) const
 {
-       FeaturesList::const_iterator i = std::find(features.begin(), 
-                                                  features.end(),
-                                                  name);
-       return i!= features.end();
+       FeaturesList::const_iterator i = find(features.begin(),
+                                             features.end(),
+                                             name);
+       return i != features.end();
 }
 
+
 void LaTeXFeatures::addExternalPreamble(string const & pream)
 {
        externalPreambles += pream;
 }
 
+
 void LaTeXFeatures::useFloat(string const & name)
 {
        usedFloats.insert(name);
+       // 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);
+       if (!fl.type().empty() && !fl.builtin()) {
+               require("float");
+       }
 }
 
+
 void LaTeXFeatures::useLanguage(Language const * lang)
 {
        UsedLanguages.insert(lang);
 }
 
-void LaTeXFeatures::includeFile(string const & key, string const & name) 
+
+void LaTeXFeatures::includeFile(string const & key, string const & name)
 {
        IncludedFiles[key] = name;
 }
 
-bool LaTeXFeatures::hasLanguages() 
+
+bool LaTeXFeatures::hasLanguages()
 {
        return !UsedLanguages.empty();
 }
 
-string LaTeXFeatures::getLanguages() const 
-{
 
+string LaTeXFeatures::getLanguages() const
+{
        ostringstream languages;
 
        for (LanguageList::const_iterator cit =
                    UsedLanguages.begin();
-            cit != UsedLanguages.end(); 
+            cit != UsedLanguages.end();
             ++cit)
                languages << (*cit)->babel() << ',';
 
        return languages.str().c_str();
 }
 
-set<string> LaTeXFeatures::getEncodingSet(string const & doc_encoding) 
+
+set<string> LaTeXFeatures::getEncodingSet(string const & doc_encoding)
 {
        set<string> encodings;
        for (LanguageList::const_iterator it =
@@ -111,75 +128,63 @@ set<string> LaTeXFeatures::getEncodingSet(string const & doc_encoding)
        return encodings;
 }
 
+namespace {
+
+char const * simplefeatures[] = {
+       "array",
+       "verbatim",
+       "longtable",
+       "rotating",
+       "latexsym",
+       "pifont",
+       "subfigure",
+       "floatflt",
+       "varioref",
+       "prettyref",
+       "float"
+};
+
+const int nb_simplefeatures = sizeof(simplefeatures) / sizeof(char const *);
+
+}
+
 string const LaTeXFeatures::getPackages() const
 {
        ostringstream packages;
-       LyXTextClass const & tclass =
-               textclasslist.TextClass(params.textclass);
+       LyXTextClass const & tclass = textclasslist[params.textclass];
 
 
        /**
         *  These are all the 'simple' includes.  i.e
         *  packages which we just \usepackage{package}
         **/
-
-// array-package
-       if (isRequired("array"))
-               packages << "\\usepackage{array}\n";
-
-       // verbatim.sty
-       if (isRequired("verbatim"))
-               packages << "\\usepackage{verbatim}\n";
-
-       //longtable.sty
-       if (isRequired("longtable"))
-               packages << "\\usepackage{longtable}\n";
-
-       //rotating.sty
-       if (isRequired("rotating"))
-               packages << "\\usepackage{rotating}\n";
-
-
-       // latexsym.sty
-       if (isRequired("latexsym"))
-               packages << "\\usepackage{latexsym}\n";
-
-       // pifont.sty
-       if (isRequired("pifont"))
-               packages << "\\usepackage{pifont}\n";
-
-       // subfigure.sty
-       if (isRequired("subfigure"))
-               packages << "\\usepackage{subfigure}\n";
-
-       // floatflt.sty
-       if (isRequired("floatflt"))
-               packages << "\\usepackage{floatflt}\n";
-
-
-       // varioref.sty
-       if (isRequired("varioref"))
-               packages << "\\usepackage{varioref}\n";
-
-       // prettyref.sty
-       if (isRequired("prettyref"))
-               packages << "\\usepackage{prettyref}\n";
+       for (int i = 0 ; i < nb_simplefeatures ; ++i) {
+               if (isRequired(simplefeatures[i]))
+                       packages << "\\usepackage{"
+                                << simplefeatures[i]
+                                << "}\n";
+       }
 
        /**
         * The rest of these packages are somewhat more complicated
         * than those above.
         **/
 
+       if (isRequired("amsmath")
+           && ! tclass.provides(LyXTextClass::amsmath)) {
+               packages << "\\usepackage{amsmath}\n";
+       }
+
        // color.sty
        if (isRequired("color")) {
                if (params.graphicsDriver == "default")
                        packages << "\\usepackage{color}\n";
                else
-                       packages << "\\usepackage[" 
+                       packages << "\\usepackage["
                                 << params.graphicsDriver
                                 << "]{color}\n";
        }
-               
+
        // makeidx.sty
        if (isRequired("makeidx")) {
                if (! tclass.provides(LyXTextClass::makeidx))
@@ -192,22 +197,11 @@ string const LaTeXFeatures::getPackages() const
                if (params.graphicsDriver == "default")
                        packages << "\\usepackage{graphicx}\n";
                else
-                       packages << "\\usepackage[" 
+                       packages << "\\usepackage["
                                 << params.graphicsDriver
                                 << "]{graphicx}\n";
        }
 
-       // INSET_GRAPHICS: remove this when InsetFig is thrown.
-       // graphics.sty
-       if (isRequired("graphics") && params.graphicsDriver != "none") {
-               if (params.graphicsDriver == "default")
-                       packages << "\\usepackage{graphics}\n";
-               else
-                       packages << "\\usepackage[" 
-                                << params.graphicsDriver
-                                << "]{graphics}\n";
-       }
-
        //if (algorithm) {
        //      packages << "\\usepackage{algorithm}\n";
        //}
@@ -250,24 +244,6 @@ string const LaTeXFeatures::getPackages() const
                            "                      {\\newcommand{\\url}{\\texttt}}\n";
 
        // float.sty
-       // 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)
-       if (!usedFloats.empty()) {
-               UsedFloats::const_iterator beg = usedFloats.begin();
-               UsedFloats::const_iterator end = usedFloats.end();
-               for (; beg != end; ++beg) {
-                       Floating const & fl = floatList.getType((*beg));
-                       if (!fl.type().empty() && !fl.builtin()) {
-                               const_cast<LaTeXFeatures *>(this)->require("floats");
-                               break;
-                       }
-               }
-       }
-       if (isRequired("floats")) {
-               packages << "\\usepackage{float}\n";
-       }
-       
        // natbib.sty
        if (isRequired("natbib")) {
                packages << "\\usepackage[";
@@ -278,11 +254,10 @@ string const LaTeXFeatures::getPackages() const
                }
                packages << "]{natbib}\n";
        }
-       
+
        packages << externalPreambles;
 
        return packages.str().c_str();
-
 }
 
 
@@ -291,21 +266,19 @@ string const LaTeXFeatures::getMacros() const
        ostringstream macros;
 
        // always include this
-       if (true || isRequired("lyx")) 
+       if (true || isRequired("lyx"))
                macros << lyx_def << '\n';
 
-       if (isRequired("lyxline")) 
+       if (isRequired("lyxline"))
                macros << lyxline_def << '\n';
 
-       if (isRequired("noun")) {
+       if (isRequired("noun"))
                macros << noun_def << '\n';
-       }
 
-       if (isRequired("lyxarrow")) {
+       if (isRequired("lyxarrow"))
                macros << lyxarrow_def << '\n';
-       }
 
-       // quotes. 
+       // quotes.
        if (isRequired("quotesinglbase"))
                macros << quotesinglbase_def << '\n';
        if (isRequired("quotedblbase"))
@@ -318,19 +291,21 @@ string const LaTeXFeatures::getMacros() const
                macros << guillemotleft_def << '\n';
        if (isRequired("guillemotright"))
                macros << guillemotright_def << '\n';
-    
-        // Math mode    
-       if (isRequired("boldsymbol") && !isRequired("amsstyle"))
+
+       // Math mode
+       if (isRequired("boldsymbol") && !isRequired("amsmath"))
                macros << boldsymbol_def << '\n';
-       if (isRequired("binom") && !isRequired("amsstyle"))
+       if (isRequired("binom") && !isRequired("amsmath"))
                macros << binom_def << '\n';
+       if (isRequired("mathcircumflex"))
+               macros << mathcircumflex_def << '\n';
 
        // other
-        if (isRequired("NeedLyXMinipageIndent"))
+       if (isRequired("NeedLyXMinipageIndent"))
                macros << minipageindent_def;
-        if (isRequired("ParagraphIndent")) 
+       if (isRequired("ParagraphIndent"))
                macros << paragraphindent_def;
-        if (isRequired("NeedLyXFootnoteCode")) 
+       if (isRequired("NeedLyXFootnoteCode"))
                macros << floatingfootnote_def;
 
        // floats
@@ -349,21 +324,20 @@ string const LaTeXFeatures::getMacros() const
 
 string const LaTeXFeatures::getTClassPreamble() const
 {
-       // the text class specific preamble 
-       LyXTextClass const & tclass =
-               textclasslist.TextClass(params.textclass);
+       // the text class specific preamble
+       LyXTextClass const & tclass = textclasslist[params.textclass];
        ostringstream tcpreamble;
-       
+
        tcpreamble << tclass.preamble();
 
-       for (LyXTextClass::size_type i = 0; i < tclass.numLayouts(); ++i) {
-               if (layout[i]) {
-                       tcpreamble  << tclass[i].preamble();
-               }
+       set<string>::const_iterator cit = layout.begin();
+       set<string>::const_iterator end = layout.end();
+       for (; cit != end; ++cit) {
+               tcpreamble << tclass[*cit].preamble();
        }
 
        return tcpreamble.str().c_str();
-}      
+}
 
 
 string const LaTeXFeatures::getLyXSGMLEntities() const
@@ -372,8 +346,7 @@ string const LaTeXFeatures::getLyXSGMLEntities() const
        ostringstream entities;
 
        if (isRequired("lyxarrow")) {
-               entities << "<!ENTITY lyxarrow \"-&gt;\">"
-                        << '\n';
+               entities << "<!ENTITY lyxarrow \"-&gt;\">" << '\n';
        }
 
        return entities.str().c_str();
@@ -389,7 +362,7 @@ string const LaTeXFeatures::getIncludedFiles(string const & fname) const
        for (FileMap::const_iterator fi = IncludedFiles.begin();
             fi != end; ++fi)
                sgmlpreamble << "\n<!ENTITY " << fi->first
-                            << (IsSGMLFilename(fi->second) ? " SYSTEM \"" : " \"" )
+                            << (IsSGMLFilename(fi->second) ? " SYSTEM \"" : " \"")
                             << MakeRelPath(fi->second, basename) << "\">";
 
        return sgmlpreamble.str().c_str();
@@ -410,7 +383,8 @@ BufferParams const & LaTeXFeatures::bufferParams() const
        return params;
 }
 
-void LaTeXFeatures::getFloatDefinitions(std::ostream & os) const
+
+void LaTeXFeatures::getFloatDefinitions(ostream & os) const
 {
        // Here we will output the code to create the needed float styles.
        // We will try to do this as minimal as possible.
@@ -422,10 +396,10 @@ void LaTeXFeatures::getFloatDefinitions(std::ostream & os) const
        // ostringstream floats;
        for (; cit != end; ++cit) {
                Floating const & fl = floatList.getType((*cit));
-               
+
                // For builtin floats we do nothing.
                if (fl.builtin()) continue;
-               
+
                // We have to special case "table" and "figure"
                if (fl.type() == "tabular" || fl.type() == "figure") {
                        // Output code to modify "table" or "figure"
@@ -445,7 +419,7 @@ void LaTeXFeatures::getFloatDefinitions(std::ostream & os) const
                        }
                } else {
                        // The other non builtin floats.
-                       
+
                        string const type = fl.type();
                        string const placement = fl.placement();
                        string const ext = fl.ext();
@@ -460,9 +434,9 @@ void LaTeXFeatures::getFloatDefinitions(std::ostream & os) const
                        os << "\n"
                           << "\\floatname{" << type << "}{"
                           << name << "}\n";
-                       
+
                        // What missing here is to code to minimalize the code
-                       // outputted so that the same floatstyle will not be
+                       // output so that the same floatstyle will not be
                        // used several times, when the same style is still in
                        // effect. (Lgb)
                }