tex2lyx: register required packages for boxes

diff --git a/src/tex2lyx/Preamble.cpp b/src/tex2lyx/Preamble.cpp
index 31c1d51f913bd459bc82647e2a633911a36f378d..c24b2eb74f0e7f4c02127a59da6ea96ed81ce6b2 100644 (file)
--- a/src/tex2lyx/Preamble.cpp
+++ b/src/tex2lyx/Preamble.cpp
@@ -183,7 +183,7 @@ const char * const known_lyx_packages[] = {"amsbsy", "amsmath", "amssymb",
 "float", "fontspec", "graphicx", "hhline", "ifthen", "longtable", "makeidx",
 "multirow", "nomencl", "pdfpages", "prettyref", "refstyle", "rotating",
 "rotfloat", "splitidx", "setspace", "subscript", "textcomp", "tipa", "tipx",
-"tone", "ulem", "url", "varioref", "verbatim", "wrapfig", "xunicode", 0};
+"tone", "ulem", "url", "varioref", "verbatim", "wrapfig", "xcolor", "xunicode", 0};
 
 // used for the handling of \newindex
 int index_number = 0;

diff --git a/src/tex2lyx/text.cpp b/src/tex2lyx/text.cpp
index 28f0b56ac42584cf637f4a4968cbe06a0a2e4ee3..5073562cdf4acd5a37e3b3873e860ea72f489d85 100644 (file)
--- a/src/tex2lyx/text.cpp
+++ b/src/tex2lyx/text.cpp
@@ -1229,6 +1229,13 @@ void parse_box(Parser & p, ostream & os, unsigned outer_flags,
                if (shadow_size != "")
                        shadow_size = "";
        }
+
+       // all boxes except of Frameless and Shaded require calc
+       if (!(outer_type.empty() || outer_type == "mbox") &&
+               !((outer_type == "shaded" && inner_type.empty()) ||
+                            (outer_type == "minipage" && inner_type == "shaded") ||
+                            (outer_type == "parbox" && inner_type == "shaded")))
+               preamble.registerAutomaticallyLoadedPackage("calc");
 }
 
 
@@ -1684,6 +1691,7 @@ void parse_environment(Parser & p, ostream & os, bool outer,
                eat_whitespace(p, os, parent_context, false);
                parse_outer_box(p, os, FLAG_END, outer, parent_context, name, "");
                p.skip_spaces();
+               preamble.registerAutomaticallyLoadedPackage("framed");
        }
 
        else if (name == "lstlisting") {