remove noload/don't typeset

[lyx.git] / src / LaTeXFeatures.C

diff --git a/src/LaTeXFeatures.C b/src/LaTeXFeatures.C
index 8af355106ca04121f04098f32de5b3189c6a0087..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;
 
@@ -51,9 +50,42 @@ void LaTeXFeatures::require(string const & name)
 }
 
 
-void LaTeXFeatures::useLayout(string const & lyt)
+void LaTeXFeatures::useLayout(string const & layoutname)
 {
-       layout.insert(lyt);
+       // Some code to avoid loops in dependency definition
+       static int level = 0;
+       const int maxlevel = 30;
+       if (level > maxlevel) {
+               lyxerr << "LaTeXFeatures::useLayout: maximum level of "
+                      << "recursion attained by layout "
+                      << layoutname << endl;
+               return;
+       }
+
+       LyXTextClass const & tclass = params.getLyXTextClass();
+       if (tclass.hasLayout(layoutname)) {
+               // Is this layout already in usedLayouts?
+               list<string>::const_iterator cit = usedLayouts.begin();
+               list<string>::const_iterator end = usedLayouts.end();
+               for (; cit != end; ++cit) {
+                       if (layoutname == *cit)
+                               return;
+               }
+
+               LyXLayout_ptr const & lyt = tclass[layoutname];
+               if (!lyt->depends_on().empty()) {
+                       ++level;
+                       useLayout(lyt->depends_on());
+                       --level;
+               }
+               usedLayouts.push_back(layoutname);
+       } else {
+               lyxerr << "LaTeXFeatures::useLayout: layout `"
+                      << layoutname << "' does not exist in this class"
+                      << endl;
+       }
+
+       --level;
 }
 
 
@@ -78,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");
        }
@@ -141,7 +173,8 @@ char const * simplefeatures[] = {
        "floatflt",
        "varioref",
        "prettyref",
-       "float"
+       "float",
+       "wasy"
 };
 
 const int nb_simplefeatures = sizeof(simplefeatures) / sizeof(char const *);
@@ -151,24 +184,23 @@ 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();
 
 
-       /**
-        *  These are all the 'simple' includes.  i.e
-        *  packages which we just \usepackage{package}
-        **/
-       for (int i = 0 ; i < nb_simplefeatures ; ++i) {
+       //
+       //  These are all the 'simple' includes.  i.e
+       //  packages which we just \usepackage{package}
+       //
+       for (int i = 0; i < nb_simplefeatures; ++i) {
                if (isRequired(simplefeatures[i]))
                        packages << "\\usepackage{"
-                                << simplefeatures[i]
-                                << "}\n";
+                                << simplefeatures[i] << "}\n";
        }
 
-       /**
-        * The rest of these packages are somewhat more complicated
-        * than those above.
-        **/
+       //
+       // The rest of these packages are somewhat more complicated
+       // than those above.
+       //
 
        if (isRequired("amsmath")
            && ! tclass.provides(LyXTextClass::amsmath)) {
@@ -265,8 +297,7 @@ string const LaTeXFeatures::getMacros() const
 {
        ostringstream macros;
 
-       // always include this
-       if (true || isRequired("lyx"))
+       if (isRequired("LyX"))
                macros << lyx_def << '\n';
 
        if (isRequired("lyxline"))
@@ -308,32 +339,44 @@ 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);
 
+       return macros.str().c_str();
+}
+
+
+string const LaTeXFeatures::getBabelOptions() const
+{
+       ostringstream tmp;
+
        for (LanguageList::const_iterator cit = UsedLanguages.begin();
             cit != UsedLanguages.end(); ++cit)
                if (!(*cit)->latex_options().empty())
-                       macros << (*cit)->latex_options() << '\n';
+                       tmp << (*cit)->latex_options() << '\n';
        if (!params.language->latex_options().empty())
-               macros << params.language->latex_options() << '\n';
+               tmp << params.language->latex_options() << '\n';
 
-       return macros.str().c_str();
+       return tmp.str().c_str();
 }
 
 
 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();
 
-       set<string>::const_iterator cit = layout.begin();
-       set<string>::const_iterator end = layout.end();
+       list<string>::const_iterator cit = usedLayouts.begin();
+       list<string>::const_iterator end = usedLayouts.end();
        for (; cit != end; ++cit) {
-               tcpreamble << tclass[*cit].preamble();
+               tcpreamble << tclass[*cit]->preamble();
        }
 
        return tcpreamble.str().c_str();
@@ -386,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}
@@ -395,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;