Fix #6276: tex2lyx fails to import captions

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@31637 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2009-10-15 14:09:11 +00:00
parent 64dfd3a7ce
commit 783b1434ea
2 changed files with 8 additions and 1 deletions

View File

@ -1565,11 +1565,16 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
} }
else if (t.cs() == "caption") { 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(); p.skip_spaces();
context.check_layout(os); context.check_layout(os);
p.skip_spaces(); p.skip_spaces();
begin_inset(os, "Caption\n\n"); 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() == '[') { if (p.next_token().character() == '[') {
p.get_token(); // eat '[' p.get_token(); // eat '['
begin_inset(os, "OptArg\n"); begin_inset(os, "OptArg\n");

View File

@ -104,6 +104,8 @@ What's new
- Fix (again!) reading of default modules by tex2lyx (part of bug 5702). - Fix (again!) reading of default modules by tex2lyx (part of bug 5702).
- Fix reading of caption texts, which got broken in 1.6.4 (bug 6276).
- Fix support for polytonic Greek with multiple diacritics (bug 5976). - Fix support for polytonic Greek with multiple diacritics (bug 5976).
- Assure the author name is encoded correctly in the LaTeX output of - Assure the author name is encoded correctly in the LaTeX output of