From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Thu, 15 Oct 2009 14:22:35 +0000 (+0000)
Subject: Fix bug #6276: tex2lyx fails to import captions
X-Git-Tag: 2.0.0~5362
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=4fc6c1247aa20722cbe42507465906d1e3baa6ba;p=features.git

Fix bug #6276: tex2lyx fails to import captions


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31638 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/tex2lyx/text.cpp b/src/tex2lyx/text.cpp
index 558462e593..eb88a96958 100644
--- a/src/tex2lyx/text.cpp
+++ b/src/tex2lyx/text.cpp
@@ -1573,11 +1573,16 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
 		}
 
 		else if (t.cs() == "caption") {
+			// FIXME: this should get some cleanup. All
+			// the \begin_layout:s are output by the
+			// Context class!
 			p.skip_spaces();
 			context.check_layout(os);
 			p.skip_spaces();
 			begin_inset(os, "Caption\n\n");
-			os << "\\begin_layout Standard";
+			os << "\\begin_layout " 
+			   << to_utf8(context.textclass.defaultLayout().name()) 
+			   << '\n';
 			if (p.next_token().character() == '[') {
 				p.get_token(); // eat '['
 				begin_inset(os, "OptArg\n");