fix bug #8223 also for branch

diff --git a/src/tex2lyx/text.cpp b/src/tex2lyx/text.cpp
index 0089a0ea3db0d4c74135e62f3b9d02fc39b268e3..9ca67c0f55ac23716349835b33972acd090a2825 100644 (file)
--- a/src/tex2lyx/text.cpp
+++ b/src/tex2lyx/text.cpp
@@ -3727,8 +3727,16 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
                        } else {
                                string special = p.getFullOpt();
                                special += p.getOpt();
-                               parse_outer_box(p, os, FLAG_ITEM, outer,
-                                               context, t.cs(), special);
+                               // LyX does not yet support \framebox without any option
+                               if (!special.empty())
+                                       parse_outer_box(p, os, FLAG_ITEM, outer,
+                                       context, t.cs(), special);
+                               else {
+                                       eat_whitespace(p, os, context, false);
+                                       handle_ert(os, "\\framebox{", context);
+                                       parse_text(p, os, FLAG_ITEM, outer, context);
+                                       handle_ert(os, "}", context);
+                               }
                        }
                }
 

diff --git a/status.20x b/status.20x
index fca87b0a743ff4f857cd032cb8789f473b869aac..bf4b797c6411746a8cd7c421ac39cc9185902aab 100644 (file)
--- a/status.20x
+++ b/status.20x
@@ -87,6 +87,7 @@ What's new
 
 * TEX2LYX
 
+- correct import of the command \framebox (bug 8223).
 
 
 * ADVANCED FIND AND REPLACE