From b559a0c607feace46693d90b3a0aa898fe022ad2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20St=C3=B6hr?= Date: Sat, 26 Apr 2008 11:01:36 +0000 Subject: [PATCH] tex2lyx/preamble.cpp: remove the setspace handling. I introduced this accidentally with the fix for bug 4773. Not taking care of setspace doesn't harm. But at the moment setspace would be erased from the preamble and only readded by LyX when the user uses global line spacing settings. But when the user only uses paragraph spacing settings, it won't be readded and the document will become uncompilable. So this commit prevents a regression that can first be undone when bug 20 is fixed. (I have a fix for bug 20 in the pipe.) git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_5_X@24508 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/tex2lyx/preamble.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/tex2lyx/preamble.cpp b/src/tex2lyx/preamble.cpp index ddf89aa55f..655c5c79c7 100644 --- a/src/tex2lyx/preamble.cpp +++ b/src/tex2lyx/preamble.cpp @@ -340,8 +340,9 @@ void handle_package(string const & name, string const & opts) else if (name == "graphicx") ; // ignore this - else if (name == "setspace") - ; // ignore this + // activate this first when bug 20 is fixed, otherwise we have a regression + //else if (name == "setspace") + // ; // ignore this else if (is_known(name, known_languages)) { if (is_known(name, known_french_languages))