From 9ac7fa483d8e519163017bc8dbe5011e56bbf6ef Mon Sep 17 00:00:00 2001 From: Georg Baum Date: Thu, 6 Jan 2011 21:38:26 +0000 Subject: [PATCH] Fix misparsing of \usepackage in \@ifundefined{textcolor}{\usepackage{color}}{} git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37140 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/tex2lyx/preamble.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/tex2lyx/preamble.cpp b/src/tex2lyx/preamble.cpp index 1c10c6a4e5..22ffcd976c 100644 --- a/src/tex2lyx/preamble.cpp +++ b/src/tex2lyx/preamble.cpp @@ -1094,6 +1094,16 @@ void parse_preamble(Parser & p, ostream & os, } } + else if (t.cs() == "@ifundefined") { + // prevent misparsing of \usepackage if it is used + // as an argument (see e.g. our own output of + // \@ifundefined above) + h_preamble << t.asInput(); + h_preamble << '{' << p.verbatim_item() << '}'; + h_preamble << '{' << p.verbatim_item() << '}'; + h_preamble << '{' << p.verbatim_item() << '}'; + } + else if (!t.cs().empty() && !in_lyx_preamble) h_preamble << '\\' << t.cs(); } -- 2.39.2