From: Uwe Stöhr <uwestoehr@lyx.org>
Date: Sun, 17 May 2015 13:00:51 +0000 (+0200)
Subject: tex2lyx/text.cpp: add default value for 2 box features
X-Git-Tag: 2.2.0alpha1~793
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=12ae7140c26258425b17c8386144e10560eb8af0;p=features.git

tex2lyx/text.cpp: add default value for 2 box features

- also add a comment
---

diff --git a/src/tex2lyx/text.cpp b/src/tex2lyx/text.cpp
index 3cc3d31ade..d1a726e20a 100644
--- a/src/tex2lyx/text.cpp
+++ b/src/tex2lyx/text.cpp
@@ -1079,6 +1079,8 @@ void parse_box(Parser & p, ostream & os, unsigned outer_flags,
 		os << "thickness \"" << thickness << "\"\n";
 		os << "separation \"" << separation << "\"\n";
 		os << "shadowsize \"" << shadowsize << "\"\n";
+		os << "framecolor \"" << framecolor << "\"\n";
+		os << "backgroundcolor \"" << backgroundcolor << "\"\n";
 		os << "status open\n\n";
 
 		// Unfortunately we can't use parse_text_in_inset:
@@ -4142,8 +4144,7 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
 				parse_outer_box(p, os, FLAG_ITEM, outer,
 				                context, "parbox", "shaded");
 			} else
-				parse_box(p, os, 0, FLAG_ITEM, outer, context,
-				          "", "", t.cs());
+				parse_box(p, os, 0, FLAG_ITEM, outer, context, "", "", t.cs());
 		}
 
 		else if (t.cs() == "fbox" || t.cs() == "mbox" ||
@@ -4151,6 +4152,8 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
 		         t.cs() == "shadowbox" || t.cs() == "doublebox")
 			parse_outer_box(p, os, FLAG_ITEM, outer, context, t.cs(), "");
 
+		//\framebox() is part of the picture environment and different from \framebox{}
+		//\framebox{} will be parsed by parse_outer_box
 		else if (t.cs() == "framebox") {
 			if (p.next_token().character() == '(') {
 				//the syntax is: \framebox(x,y)[position]{content}