From 80523bbe07d64e00fde8534892a44286de5971d0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Uwe=20St=C3=B6hr?= Date: Tue, 25 Oct 2011 15:39:50 +0000 Subject: [PATCH] tex2lyx: adapt handling of \fontencoding to LyX 2.x's syntax git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39962 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/tex2lyx/preamble.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/tex2lyx/preamble.cpp b/src/tex2lyx/preamble.cpp index 23d95e8b5a..917fbabbd4 100644 --- a/src/tex2lyx/preamble.cpp +++ b/src/tex2lyx/preamble.cpp @@ -175,7 +175,7 @@ string h_use_default_options = "false"; string h_options; string h_language = "english"; string h_language_package = "default"; -string h_fontencoding = "default"; +string h_fontencoding = "global"; string h_font_roman = "default"; string h_font_sans = "default"; string h_font_typewriter = "default"; @@ -549,11 +549,9 @@ void handle_package(Parser &p, string const & name, string const & opts, else if (name == "fontenc") { h_fontencoding = getStringFromVector(options, ","); - /* 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) + // as of version LyX 2.0 "T1" is equal to the setting "global" + if (h_fontencoding == "T1") h_fontencoding = "global"; - */ options.clear(); } -- 2.39.2