From: Uwe Stöhr <uwestoehr@lyx.org>
Date: Sun, 25 Nov 2012 01:21:13 +0000 (+0100)
Subject: fix bug #8223 also for branch
X-Git-Tag: 2.0.6~229
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=79a8c0d2a9582c6623d6d0a739920ef0a3eca005;p=features.git

fix bug #8223 also for branch
---

diff --git a/src/tex2lyx/text.cpp b/src/tex2lyx/text.cpp
index 0089a0ea3d..9ca67c0f55 100644
--- 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 fca87b0a74..bf4b797c64 100644
--- 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