tex2lyx: support for subfloats

[lyx.git] / src / tex2lyx / preamble.cpp

diff --git a/src/tex2lyx/preamble.cpp b/src/tex2lyx/preamble.cpp
index 151efff4c9f29af2b1883841564cc21b5a565cf0..e31a2a8252a497558d131848cbe6287568849fda 100644 (file)
--- a/src/tex2lyx/preamble.cpp
+++ b/src/tex2lyx/preamble.cpp
@@ -651,6 +651,12 @@ void handle_package(Parser &p, string const & name, string const & opts,
        else if (name == "rotfloat")
                ; // ignore this
 
+       else if (name == "wrapfig")
+               ; // ignore this
+
+       else if (name == "subfig")
+               ; // ignore this
+
        else if (is_known(name, known_languages))
                h_language = name;
 
@@ -1277,6 +1283,13 @@ void parse_preamble(Parser & p, ostream & os,
                        } else if (arg1 == "definecolor" && arg2 == "\\usepackage{color}"
                                && arg3.empty()) {
                                ifundefined_color_set = true;
+                       // test for case
+                       //\@ifundefined{showcaptionsetup}{}{%
+                       // \PassOptionsToPackage{caption=false}{subfig}}
+                       // that LyX uses for subfloats
+                       } else if (arg1 == "showcaptionsetup" && arg2.empty()
+                               && arg3 == "%\n \\PassOptionsToPackage{caption=false}{subfig}") {
+                               ; // do nothing
                        } else if (!in_lyx_preamble) {
                                h_preamble << t.asInput()
                                           << '{' << arg1 << '}'