remove noload/don't typeset

[lyx.git] / src / LaTeXFeatures.C

diff --git a/src/LaTeXFeatures.C b/src/LaTeXFeatures.C
index df738be2c2fb6e0daeeb82e1426428fff257e2f4..d9d53774a95a7c96e855bcf94ee94599d18b1c49 100644 (file)
--- a/src/LaTeXFeatures.C
+++ b/src/LaTeXFeatures.C
@@ -19,7 +19,6 @@
 #include "lyx_sty.h"
 #include "lyxrc.h"
 #include "bufferparams.h"
-#include "lyxtextclasslist.h"
 #include "FloatList.h"
 #include "language.h"
 #include "encoding.h"
@@ -31,8 +30,8 @@
 using lyx::textclass_type;
 
 using std::endl;
+using std::list;
 using std::set;
-using std::vector;
 using std::find;
 using std::ostream;
 
@@ -62,18 +61,18 @@ void LaTeXFeatures::useLayout(string const & layoutname)
                       << layoutname << endl;
                return;
        }
-       
-       LyXTextClass tclass = textclasslist[params.textclass];
+
+       LyXTextClass const & tclass = params.getLyXTextClass();
        if (tclass.hasLayout(layoutname)) {
                // Is this layout already in usedLayouts?
-               vector<string>::const_iterator cit = usedLayouts.begin();
-               vector<string>::const_iterator end = usedLayouts.end();
+               list<string>::const_iterator cit = usedLayouts.begin();
+               list<string>::const_iterator end = usedLayouts.end();
                for (; cit != end; ++cit) {
                        if (layoutname == *cit)
                                return;
                }
-               
-               LyXLayout_ptr lyt = tclass[layoutname];
+
+               LyXLayout_ptr const & lyt = tclass[layoutname];
                if (!lyt->depends_on().empty()) {
                        ++level;
                        useLayout(lyt->depends_on());
@@ -83,9 +82,9 @@ void LaTeXFeatures::useLayout(string const & layoutname)
        } else {
                lyxerr << "LaTeXFeatures::useLayout: layout `"
                       << layoutname << "' does not exist in this class"
-                      << endl; 
+                      << endl;
        }
-       
+
        --level;
 }
 
@@ -111,7 +110,7 @@ void LaTeXFeatures::useFloat(string const & 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);
+       Floating const & fl = params.getLyXTextClass().floats().getType(name);
        if (!fl.type().empty() && !fl.builtin()) {
                require("float");
        }
@@ -185,7 +184,7 @@ const int nb_simplefeatures = sizeof(simplefeatures) / sizeof(char const *);
 string const LaTeXFeatures::getPackages() const
 {
        ostringstream packages;
-       LyXTextClass const & tclass = textclasslist[params.textclass];
+       LyXTextClass const & tclass = params.getLyXTextClass();
 
 
        //
@@ -195,7 +194,7 @@ string const LaTeXFeatures::getPackages() const
        for (int i = 0; i < nb_simplefeatures; ++i) {
                if (isRequired(simplefeatures[i]))
                        packages << "\\usepackage{"
-                                << simplefeatures[i] << "}\n";
+                                << simplefeatures[i] << "}\n";
        }
 
        //
@@ -340,6 +339,10 @@ string const LaTeXFeatures::getMacros() const
        if (isRequired("NeedLyXFootnoteCode"))
                macros << floatingfootnote_def;
 
+       // some problems with tex->html converters
+       if (isRequired("NeedTabularnewline"))
+               macros << tabularnewline_def;
+
        // floats
        getFloatDefinitions(macros);
 
@@ -365,13 +368,13 @@ string const LaTeXFeatures::getBabelOptions() const
 string const LaTeXFeatures::getTClassPreamble() const
 {
        // the text class specific preamble
-       LyXTextClass const & tclass = textclasslist[params.textclass];
+       LyXTextClass const & tclass = params.getLyXTextClass();
        ostringstream tcpreamble;
 
        tcpreamble << tclass.preamble();
 
-       vector<string>::const_iterator cit = usedLayouts.begin();
-       vector<string>::const_iterator end = usedLayouts.end();
+       list<string>::const_iterator cit = usedLayouts.begin();
+       list<string>::const_iterator end = usedLayouts.end();
        for (; cit != end; ++cit) {
                tcpreamble << tclass[*cit]->preamble();
        }
@@ -426,6 +429,8 @@ BufferParams const & LaTeXFeatures::bufferParams() const
 
 void LaTeXFeatures::getFloatDefinitions(ostream & os) const
 {
+       FloatList const & floats = params.getLyXTextClass().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}
@@ -435,7 +440,7 @@ void LaTeXFeatures::getFloatDefinitions(ostream & os) const
        UsedFloats::const_iterator end = usedFloats.end();
        // ostringstream floats;
        for (; cit != end; ++cit) {
-               Floating const & fl = floatList.getType((*cit));
+               Floating const & fl = floats.getType((*cit));
 
                // For builtin floats we do nothing.
                if (fl.builtin()) continue;