Dekels tabular/textinset patches

[lyx.git] / src / LaTeXFeatures.C

diff --git a/src/LaTeXFeatures.C b/src/LaTeXFeatures.C
index 204e9a66d9cbad89a962656adb81628eb19c7b45..b49d820fe6a9a014492dcf1c430a7e1fca0abfe7 100644 (file)
--- a/src/LaTeXFeatures.C
+++ b/src/LaTeXFeatures.C
@@ -22,10 +22,12 @@
 #include "LaTeXFeatures.h"
 #include "bufferparams.h"
 #include "layout.h"
+#include "support/filetools.h"
+#include "FloatList.h"
 
 using std::endl;
 
-LaTeXFeatures::LaTeXFeatures(BufferParams const & p, int n)
+LaTeXFeatures::LaTeXFeatures(BufferParams const & p, LyXTextClass::size_type n)
        : layout(n, false), params(p)
 {
        // packages
@@ -146,8 +148,8 @@ string const LaTeXFeatures::getPackages()
        // makeidx.sty
        if (makeidx) {
                if (! tclass.provides(LyXTextClass::makeidx)
-                   && params.language != "french") // french provides
-                                                   // \index !
+                   && params.language->babel() != "french") // french provides
+                                                            // \index !
                        packages += "\\usepackage{makeidx}\n";
                packages += "\\makeindex\n";
        }
@@ -252,11 +254,22 @@ string const LaTeXFeatures::getPackages()
                packages += "\\usepackage{prettyref}\n";
 
        // float.sty
-       // This is not correct and needs fixing.
-       // We don't need float.sty if we only use unchanged
-       // table and figure floats. (Lgb)
-       if (!usedFloats.empty())
-               packages += "\\usepackage{float}\n";
+       // We only need float.sty if we use non builtin floats. This includes
+       // modified table and figure floats. (Lgb)
+       if (!usedFloats.empty()) {
+               bool use_float = false;
+               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()) {
+                               use_float = true;
+                               break;
+                       }
+               }
+               if (use_float)
+                       packages += "\\usepackage{float}\n";
+       }
        
        packages += externalPreambles;
 
@@ -317,6 +330,22 @@ string const LaTeXFeatures::getMacros()
        // \floatstyle{ruled}
        // \newfloat{algorithm}{htbp}{loa}
        // \floatname{algorithm}{Algorithm}
+       UsedFloats::const_iterator beg = usedFloats.begin();
+       UsedFloats::const_iterator end = usedFloats.end();
+       for (; beg != end; ++beg) {
+               Floating const & fl = floatList.getType((*beg));
+               
+               // We have to special case "table" and "figure"
+               if ((fl.type() == "tabular" && !fl.builtin()) ||
+                   (fl.type() == "figure" && !fl.builtin())) {
+                       // Output code to modify "table" or "figure"
+                       // but only if builtin == false
+                       
+               } else {
+                       // The other non builtin floats.
+               }
+       }
+
        return macros;
 }
 
@@ -338,13 +367,17 @@ string const LaTeXFeatures::getTClassPreamble()
 }      
 
 
-string const LaTeXFeatures::getIncludedFiles()
+string const LaTeXFeatures::getIncludedFiles(string const fname) const
 {
        string sgmlpreamble;
+       string basename = BasePath(fname);
+
        FileMap::const_iterator end = IncludedFiles.end();
-       for(FileMap::const_iterator fi=IncludedFiles.begin(); fi != end; ++fi)
-               sgmlpreamble += "\n<!entity " + fi->first
-                       + " system \"" + fi->second + "\">";
+       for (FileMap::const_iterator fi = IncludedFiles.begin();
+            fi != end; ++fi)
+         sgmlpreamble += "\n<!ENTITY " + fi->first
+                       + (IsSGMLFilename(fi->second) ? " SYSTEM \"" : " \"" )
+                       + MakeRelPath(fi->second,basename) + "\">";
 
        return sgmlpreamble;
 }