anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 13:18:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Simplify logic

Browse Source 
The old code was more complicated than needed, we have unstarred_name to make
our live easier. The test proves that the new code works as before.
This commit is contained in:
Georg Baum 2015-11-27 20:35:13 +01:00
parent 8ac43f2e04
commit 5c35ebcd24
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/tex2lyx/text.cpp
View File

@ -1555,25 +1555,17 @@ void parse_environment(Parser & p, ostream & os, bool outer,
preamble.registerAutomaticallyLoadedPackage("verbatim");
}
else if (unstarred_name == "verbatim" || name == "verbatim*") {
else if (unstarred_name == "verbatim") {
// FIXME: this should go in the generic code that
// handles environments defined in layout file that
// have "PassThru 1". However, the code over there is
// already too complicated for my taste.
string ascii_name;
string env_name;
if (unstarred_name == "verbatim") {
ascii_name = "Verbatim";
env_name = "verbatim";
}
if (name == "verbatim*") {
ascii_name = "Verbatim*";
env_name = name;
}
string const ascii_name =
(name == "verbatim*") ? "Verbatim*" : "Verbatim";
parent_context.new_paragraph(os);
Context context(true, parent_context.textclass,
&parent_context.textclass[from_ascii(ascii_name)]);
string s = p.verbatimEnvironment(env_name);
string s = p.verbatimEnvironment(name);
output_ert(os, s, context);
p.skip_spaces();
}