r40193 - lyx-devel/trunk/src/tex2lyx

[baum]

Author: baum
Date: Mon Nov 14 22:00:47 2011
New Revision: 40193
URL: http://www.lyx.org/trac/changeset/40193

Log:
Fix bug #7895: Do not output lines with only a single space.

Modified:
   lyx-devel/trunk/src/tex2lyx/text.cpp

Modified: lyx-devel/trunk/src/tex2lyx/text.cpp
==============================================================================
--- lyx-devel/trunk/src/tex2lyx/text.cpp        Mon Nov 14 01:13:09 2011        
(r40192)
+++ lyx-devel/trunk/src/tex2lyx/text.cpp        Mon Nov 14 22:00:47 2011        
(r40193)
@@ -1187,6 +1187,8 @@
 
        else if (parent_context.textclass.floats().typeExist(unstarred_name)) {
                eat_whitespace(p, os, parent_context, false);
+               string const opt = p.hasOpt() ? p.getArg('[', ']') : string();
+               eat_whitespace(p, os, parent_context, false);
                parent_context.check_layout(os);
                begin_inset(os, "Float " + unstarred_name + "\n");
                // store the float type for subfloats
@@ -1197,8 +1199,8 @@
                        float_type = unstarred_name;
                else
                        float_type = "";
-               if (p.hasOpt())
-                       os << "placement " << p.getArg('[', ']') << '\n';
+               if (!opt.empty())
+                       os << "placement " << opt << '\n';
                os << "wide " << convert<string>(is_starred)
                   << "\nsideways false"
                   << "\nstatus open\n\n";