tex2lyx/text.cpp: take care of the brace pair after comment environments that are...

[lyx.git] / src / tex2lyx / tex2lyx.cpp

diff --git a/src/tex2lyx/tex2lyx.cpp b/src/tex2lyx/tex2lyx.cpp
index 62b783c40844647ecdacf3d7a26ad9635dc9683f..20f4533784de3896bd748b0e22d5103c1a8d1ffe 100644 (file)
--- a/src/tex2lyx/tex2lyx.cpp
+++ b/src/tex2lyx/tex2lyx.cpp
@@ -13,11 +13,12 @@
 #include <config.h>
 
 #include "tex2lyx.h"
-#include "Context.h"
 
+#include "Context.h"
 #include "TextClass.h"
 #include "Layout.h"
 
+#include "support/assert.h"
 #include "support/convert.h"
 #include "support/debug.h"
 #include "support/ExceptionMessage.h"
@@ -40,13 +41,9 @@ using namespace lyx::support::os;
 
 namespace lyx {
 
-// Hacks to allow the thing to link in the lyxlayout stuff
-LayoutPtr captionlayout;
-
-
 string const trim(string const & a, char const * p)
 {
-       // BOOST_ASSERT(p);
+       // LASSERT(p, /**/);
 
        if (a.empty() || !*p)
                return a;
@@ -400,7 +397,6 @@ void tex2lyx(istream & is, ostream & os)
        stringstream ss;
        TeX2LyXDocClass textclass;
        parse_preamble(p, ss, documentclass, textclass);
-       captionlayout = LayoutPtr(Layout::forCaption());
 
        active_environments.push_back("document");
        Context context(true, textclass);