r37140 - lyx-devel/trunk/src/tex2lyx

[baum]

Author: baum
Date: Thu Jan  6 22:38:26 2011
New Revision: 37140
URL: http://www.lyx.org/trac/changeset/37140

Log:
Fix misparsing of \usepackage in
\...@ifundefined{textcolor}{\usepackage{color}}{}

Modified:
   lyx-devel/trunk/src/tex2lyx/preamble.cpp

Modified: lyx-devel/trunk/src/tex2lyx/preamble.cpp
==============================================================================
--- lyx-devel/trunk/src/tex2lyx/preamble.cpp    Thu Jan  6 21:58:19 2011        
(r37139)
+++ lyx-devel/trunk/src/tex2lyx/preamble.cpp    Thu Jan  6 22:38:26 2011        
(r37140)
@@ -1094,6 +1094,16 @@
                        }
                }
 
+               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();
        }