Applied Angus patch to compile on DEC C++ and to avoid name clashes

[lyx.git] / src / LaTeXFeatures.C

diff --git a/src/LaTeXFeatures.C b/src/LaTeXFeatures.C
index 0bfa934613caf5473d67e72812203ea0f8c6c3df..2da36b28b8c67fe849a2c4a6cf560f1accfac72a 100644 (file)
--- a/src/LaTeXFeatures.C
+++ b/src/LaTeXFeatures.C
@@ -330,21 +330,44 @@ string const LaTeXFeatures::getMacros()
        // \floatstyle{ruled}
        // \newfloat{algorithm}{htbp}{loa}
        // \floatname{algorithm}{Algorithm}
-       UsedFloats::const_iterator beg = usedFloats.begin();
+       UsedFloats::const_iterator cit = usedFloats.begin();
        UsedFloats::const_iterator end = usedFloats.end();
-       for (; beg != end; ++beg) {
-               Floating const & fl = floatList.getType((*beg));
+       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.builtin()) ||
-                   (fl.type() == "figure" && !fl.builtin())) {
+               if (fl.type() == "tabular" || fl.type() == "figure") {
                        // Output code to modify "table" or "figure"
                        // but only if builtin == false
-                       
                } else {
                        // The other non builtin floats.
+
+                       string type = fl.type();
+                       string placement = fl.placement();
+                       string ext = fl.ext();
+                       string within = fl.within();
+                       string style = fl.style();
+                       string name = fl.name();
+                       floats << "\\floatstyle{" << style << "}\n"
+                              << "\\newfloat{" << type << "}{" << placement
+                              << "}{" << ext << "}";
+                       if (!within.empty())
+                               floats << "[" << within << "]";
+                       floats << "\n"
+                              << "\\floatname{" << type << "}{"
+                              << name << "}\n";
+
+                       // What missing here is to code to minimalize the code
+                       // outputted so that the same flotastyle will not be
+                       // used several times. when the same style is still in
+                       // effect. (Lgb)
                }
        }
+       macros += floats.str().c_str();
 
        for (LanguageList::const_iterator cit = UsedLanguages.begin();
             cit != UsedLanguages.end(); ++cit)
@@ -377,7 +400,7 @@ string const LaTeXFeatures::getTClassPreamble()
 string const LaTeXFeatures::getIncludedFiles(string const fname) const
 {
        string sgmlpreamble;
-       string basename = BasePath(fname);
+       string basename = OnlyPath(fname);
 
        FileMap::const_iterator end = IncludedFiles.end();
        for (FileMap::const_iterator fi = IncludedFiles.begin();