From 0471fe366a58aa2dd456f61a1ac9c53bde4b221c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Uwe=20St=C3=B6hr?= Date: Tue, 19 May 2015 00:17:08 +0200 Subject: [PATCH] tex2lyx: register required packages for boxes --- src/tex2lyx/Preamble.cpp | 2 +- src/tex2lyx/text.cpp | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/tex2lyx/Preamble.cpp b/src/tex2lyx/Preamble.cpp index 31c1d51f91..c24b2eb74f 100644 --- 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 28f0b56ac4..5073562cdf 100644 --- 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") { -- 2.39.5