anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 01:59:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tex2lyx: clear latexparam after use.

Browse Source 
(cherry picked from commit 7e3a41bd15)
This commit is contained in:
Juergen Spitzmueller 2018-03-17 12:38:53 +01:00
parent ce5b420a44
commit 5170efe2c9
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/tex2lyx/text.cpp
View File

@ -786,7 +786,7 @@ void output_arguments(ostream & os, Parser & p, bool outer, bool need_layout, st
rdelim = "}"; rdelim = "}";
p.get_token(); // eat ldelim p.get_token(); // eat ldelim
if (ldelim.size() > 1) if (ldelim.size() > 1)
p.get_token(); // eat ldelim p.get_token(); // eat ldelim
if (need_layout) { if (need_layout) {
context.check_layout(os); context.check_layout(os);
need_layout = false; need_layout = false;
@ -812,7 +812,7 @@ void output_arguments(ostream & os, Parser & p, bool outer, bool need_layout, st
continue; continue;
p.get_token(); // eat ldelim p.get_token(); // eat ldelim
if (ldelim.size() > 1) if (ldelim.size() > 1)
p.get_token(); // eat ldelim p.get_token(); // eat ldelim
if (need_layout) { if (need_layout) {
context.check_layout(os); context.check_layout(os);
need_layout = false; need_layout = false;
@ -3295,6 +3295,7 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
context.latexparam = newlayout->latexparam(); context.latexparam = newlayout->latexparam();
// write the layout // write the layout
output_command_layout(os, p, outer, context, newlayout); output_command_layout(os, p, outer, context, newlayout);
context.latexparam.clear();
p.skip_spaces(); p.skip_spaces();
if (!preamble.titleLayoutFound()) if (!preamble.titleLayoutFound())
preamble.titleLayoutFound(newlayout->intitle); preamble.titleLayoutFound(newlayout->intitle);
@ -5467,6 +5468,7 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
output_ert(os, arg, newcontext); output_ert(os, arg, newcontext);
} else } else
parse_text_in_inset(p, os, FLAG_ITEM, false, context, newinsetlayout); parse_text_in_inset(p, os, FLAG_ITEM, false, context, newinsetlayout);
context.latexparam.clear();
if (caption) if (caption)
p.skip_spaces(); p.skip_spaces();
// Minted caption insets are not closed here because // Minted caption insets are not closed here because