From: Uwe Stöhr <uwestoehr@web.de>
Date: Wed, 26 Oct 2011 01:25:43 +0000 (+0000)
Subject: backporting tex2lyx: fix bug #7856
X-Git-Tag: 2.0.2~122
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=3e9d409771c4e4f4c8b35570da2105fe5b01ae49;p=features.git

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 a2feef7360..58c82f077e 100644
--- 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";