This commit is contained in:
Georg Baum 2012-10-05 23:44:21 +02:00
parent 28dc8a77ee
commit 87641e506e

View File

@ -2153,7 +2153,7 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
<< "\\end_layout\n\n" << "\\end_layout\n\n"
<< "\\begin_layout Plain Layout\n" << "\\begin_layout Plain Layout\n"
<< "This document contains text in Chinese, Japanese or Korean.\n" << "This document contains text in Chinese, Japanese or Korean.\n"
<< " It was therefore impossible for tex2lyx to set the correct document langue for your document." << " It was therefore impossible for tex2lyx to set the correct document language for your document."
<< " Please set the language manually in the document settings.\n" << " Please set the language manually in the document settings.\n"
<< "\\end_layout\n"; << "\\end_layout\n";
end_inset(os); end_inset(os);
@ -2739,8 +2739,7 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
context.check_layout(os); context.check_layout(os);
p.skip_spaces(); p.skip_spaces();
begin_inset(os, "Caption\n"); begin_inset(os, "Caption\n");
Context newcontext(true, context.textclass); Context newcontext(true, context.textclass, 0, 0, context.font);
newcontext.font = context.font;
newcontext.check_layout(os); newcontext.check_layout(os);
if (p.next_token().cat() != catEscape && if (p.next_token().cat() != catEscape &&
p.next_token().character() == '[') { p.next_token().character() == '[') {
@ -2790,8 +2789,8 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
os << "\n\\begin_layout Plain Layout"; os << "\n\\begin_layout Plain Layout";
p.skip_spaces(); p.skip_spaces();
begin_inset(os, "Caption\n"); begin_inset(os, "Caption\n");
Context newcontext(true, context.textclass); Context newcontext(true, context.textclass,
newcontext.font = context.font; 0, 0, context.font);
newcontext.check_layout(os); newcontext.check_layout(os);
os << caption << "\n"; os << caption << "\n";
newcontext.check_end_layout(os); newcontext.check_end_layout(os);