Remove wmf2eps as EMF > EPS converter

[lyx.git] / src / tex2lyx / text.cpp

diff --git a/src/tex2lyx/text.cpp b/src/tex2lyx/text.cpp
index ab000939b811bd4b5199eed56e04e6ee3e9ac016..2fe40bde05cadfbab9aa39ac4417e75b3e812609 100644 (file)
--- a/src/tex2lyx/text.cpp
+++ b/src/tex2lyx/text.cpp
@@ -429,7 +429,7 @@ bool translate_len(string const & length, string & valstring, string & unit)
        return true;
 }
 
-}
+} // namespace
 
 
 string translate_len(string const & length)
@@ -1326,7 +1326,12 @@ void parse_listings(Parser & p, ostream & os, Context & parent_context,
 {
        parent_context.check_layout(os);
        begin_inset(os, "listings\n");
-       string arg = p.hasOpt() ? p.verbatimOption() : string();
+       string arg = p.hasOpt() ? subst(p.verbatimOption(), "\n", "") : string();
+       size_t i;
+       while ((i = arg.find(", ")) != string::npos
+                       || (i = arg.find(",\t")) != string::npos)
+               arg.erase(i + 1, 1);
+
        if (use_minted) {
                string const language = p.getArg('{', '}');
                p.skip_spaces(true);