From f397989137e44b5d125ff2821d2534465f70456a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Uwe=20St=C3=B6hr?= Date: Wed, 26 Oct 2011 19:53:29 +0000 Subject: [PATCH] tex2lyx/preamble.cpp: revert r39962 (the string initialization was already reverted) git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40019 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/tex2lyx/preamble.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/tex2lyx/preamble.cpp b/src/tex2lyx/preamble.cpp index 964d062ada..151efff4c9 100644 --- a/src/tex2lyx/preamble.cpp +++ b/src/tex2lyx/preamble.cpp @@ -571,9 +571,11 @@ void handle_package(Parser &p, string const & name, string const & opts, else if (name == "fontenc") { h_fontencoding = getStringFromVector(options, ","); - // as of version LyX 2.0 "T1" is equal to the setting "global" - if (h_fontencoding == "T1") + /* We could do the following for better round trip support, + * but this makes the document less portable, so I skip it: + if (h_fontencoding == lyxrc.fontenc) h_fontencoding = "global"; + */ options.clear(); } -- 2.39.2