anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-23 10:18:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Handle properly insets which have the PassThru property

Browse Source 
This fixes in particular bug 5312:
  % escape in \url{} treated as TeX comment start by importer
This commit is contained in:
Jean-Marc Lasgouttes 2013-02-12 18:36:25 +01:00
parent c0d4805acf
commit 3d2dcab03f
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/tex2lyx/text.cpp
View File

@ -1698,6 +1698,13 @@ void parse_environment(Parser & p, ostream & os, bool outer,
begin_inset(os, "Flex "); begin_inset(os, "Flex ");
os << to_utf8(newinsetlayout->name()) << '\n' os << to_utf8(newinsetlayout->name()) << '\n'
<< "status collapsed\n"; << "status collapsed\n";
if (newinsetlayout->isPassThru()) {
string const arg = p.verbatimEnvironment(name);
Context context(true, parent_context.textclass,
&parent_context.textclass.plainLayout(),
parent_context.layout);
output_ert(os, arg, parent_context);
} else
parse_text_in_inset(p, os, FLAG_END, false, parent_context, newinsetlayout); parse_text_in_inset(p, os, FLAG_END, false, parent_context, newinsetlayout);
end_inset(os); end_inset(os);
} }
@ -4476,6 +4483,19 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
begin_inset(os, "Flex "); begin_inset(os, "Flex ");
os << to_utf8(newinsetlayout->name()) << '\n' os << to_utf8(newinsetlayout->name()) << '\n'
<< "status collapsed\n"; << "status collapsed\n";
if (newinsetlayout->isPassThru()) {
// set catcodes to verbatim early, just in case.
p.setCatcodes(VERBATIM_CATCODES);
string delim = p.get_token().asInput();
if (delim != "{")
cerr << "Warning: bad delimiter for command " << t.asInput() << endl;
string const arg = p.verbatimStuff("}");
Context newcontext(true, context.textclass);
if (newinsetlayout->forcePlainLayout())
newcontext.layout = &context.textclass.plainLayout();
output_ert(os, arg, newcontext);
} else
parse_text_in_inset(p, os, FLAG_ITEM, false, context, newinsetlayout); parse_text_in_inset(p, os, FLAG_ITEM, false, context, newinsetlayout);
end_inset(os); end_inset(os);
} }