From: Uwe Stöhr <uwestoehr@web.de>
Date: Tue, 25 Oct 2011 23:17:24 +0000 (+0000)
Subject: tex2lyx: fix bug #7856
X-Git-Tag: 2.1.0beta1~2491
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=e2d9adadaa3320e3e1c82b7ee4e0a0141ecb16eb;p=features.git

tex2lyx: fix bug #7856

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39983 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/tex2lyx/preamble.cpp b/src/tex2lyx/preamble.cpp
index ded4a6d68d..4114d6df32 100644
--- a/src/tex2lyx/preamble.cpp
+++ b/src/tex2lyx/preamble.cpp
@@ -523,6 +523,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";