more cursor dispatch

[lyx.git] / src / LaTeXFeatures.C

diff --git a/src/LaTeXFeatures.C b/src/LaTeXFeatures.C
index cf96b66de4d428db2c735047d7222d842925ff9d..aced52e5c3fda3dda8f7558a524e4ac8c8991797 100644 (file)
--- a/src/LaTeXFeatures.C
+++ b/src/LaTeXFeatures.C
@@ -35,15 +35,15 @@ using lyx::support::OnlyPath;
 
 using std::endl;
 using std::find;
-
+using std::string;
 using std::list;
 using std::ostream;
 using std::ostringstream;
 using std::set;
 
 
-LaTeXFeatures::LaTeXFeatures(Buffer const & b, BufferParams const & p)
-       : buffer_(b), params_(p)
+LaTeXFeatures::LaTeXFeatures(Buffer const & b, BufferParams const & p, bool n)
+       : buffer_(b), params_(p), nice_(n)
 {}
 
 
@@ -189,7 +189,9 @@ char const * simplefeatures[] = {
        "prettyref",
        "float",
        "wasy",
-       "dvipost"
+       "dvipost",
+       "fancybox",
+       "calc"
 };
 
 int const nb_simplefeatures = sizeof(simplefeatures) / sizeof(char const *);
@@ -355,8 +357,6 @@ string const LaTeXFeatures::getMacros() const
                macros << mathcircumflex_def << '\n';
 
        // other
-       if (isRequired("NeedLyXMinipageIndent"))
-               macros << minipageindent_def;
        if (isRequired("ParagraphLeftIndent"))
                macros << paragraphleftindent_def;
        if (isRequired("NeedLyXFootnoteCode"))
@@ -407,6 +407,13 @@ string const LaTeXFeatures::getTClassPreamble() const
                tcpreamble << tclass[*cit]->preamble();
        }
 
+       CharStyles::iterator cs = tclass.charstyles().begin();
+       CharStyles::iterator csend = tclass.charstyles().end();
+       for (; cs != csend; ++cs) {
+               if (isRequired(cs->name))
+                       tcpreamble << cs->preamble;
+       }
+       
        return tcpreamble.str();
 }