anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-07 12:32:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tex2lyx: do not keep the Flex prefix for Flex insets names

Browse Source 
While there is code in LyX that handles this, tex2lyx should respect
the format that LyX produces and the Flex: prefix is gone since
cfeddb92 in 2014.

In particular, this prefix is known to cause assertion when undoing a
document setting change.
This commit is contained in:
Jean-Marc Lasgouttes 2017-12-20 16:00:39 +01:00
parent 1eaf66d79e
commit 40a3a44aa2
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/tex2lyx/text.cpp
View File

@ -1994,7 +1994,11 @@ void parse_environment(Parser & p, ostream & os, bool outer,
eat_whitespace(p, os, parent_context, false);
parent_context.check_layout(os);
begin_inset(os, "Flex ");
os << to_utf8(newinsetlayout->name()) << '\n'
docstring flex_name = newinsetlayout->name();
// FIXME: what do we do if the prefix is not Flex: ?
if (prefixIs(flex_name, from_ascii("Flex:")))
flex_name.erase(0, 5);
os << to_utf8(flex_name) << '\n'
<< "status collapsed\n";
if (newinsetlayout->isPassThru()) {
string const arg = p.verbatimEnvironment(name);
@ -4803,7 +4807,7 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
p.get_token();
p.skip_spaces();
context.check_layout(os);
docstring const name = newinsetlayout->name();
docstring name = newinsetlayout->name();
bool const caption = name.find(from_ascii("Caption:")) == 0;
if (caption) {
// Already done for floating minted listings.
@ -4812,6 +4816,9 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
os << to_utf8(name.substr(8)) << '\n';
}
} else {
// FIXME: what do we do if the prefix is not Flex: ?
if (prefixIs(name, from_ascii("Flex:")))
name.erase(0, 5);
begin_inset(os, "Flex ");
os << to_utf8(name) << '\n'
<< "status collapsed\n";