backporting tex2lyx: fix bug #7856

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39993 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/tex2lyx/preamble.cpp b/src/tex2lyx/preamble.cpp
index a2feef7360ddab9fc763cce4e640eccdd304ab91..58c82f077e95185053c2eb73d767658eefd91535 100644 (file)
--- a/src/tex2lyx/preamble.cpp
+++ b/src/tex2lyx/preamble.cpp
@@ -524,6 +524,12 @@ void handle_package(Parser &p, string const & name, string const & opts,
        if (name == "eco")
                h_font_osf = "true";
 
+       // after the detection and handling of special cases, we can remove the
+       // fonts, otherwise they would appear in the preamble, see bug #7856
+       if (is_known(name, known_roman_fonts) || is_known(name, known_sans_fonts)
+               ||      is_known(name, known_typewriter_fonts))
+               ;
+
        else if (name == "amsmath" || name == "amssymb")
                h_use_amsmath = "2";