tex2lyx/text.cpp: a fix for \fboxcolor around \parbox and minipage

diff --git a/src/tex2lyx/test/box-color-size-space-align.lyx.lyx b/src/tex2lyx/test/box-color-size-space-align.lyx.lyx
index d879302abed9f6dd265dbaab6667cb921d4baa6a..2d5881efe95a8e2b3d0302f720170c00cd6fc80a 100644 (file)
--- a/src/tex2lyx/test/box-color-size-space-align.lyx.lyx
+++ b/src/tex2lyx/test/box-color-size-space-align.lyx.lyx
@@ -1523,7 +1523,7 @@ www
 \begin_inset Box Boxed
 position "t"
 hor_pos "l"
-has_inner_box 0
+has_inner_box 1
 inner_pos "t"
 use_parbox 0
 use_makebox 0
@@ -1553,7 +1553,7 @@ www
 \begin_inset Box Boxed
 position "t"
 hor_pos "l"
-has_inner_box 0
+has_inner_box 1
 inner_pos "t"
 use_parbox 1
 use_makebox 0

diff --git a/src/tex2lyx/text.cpp b/src/tex2lyx/text.cpp
index 3bfcc627366791e65cbbd2bceec1884e32d0b560..664e2925d595d3043e232c0c2052db55ed8bb90d 100644 (file)
--- a/src/tex2lyx/text.cpp
+++ b/src/tex2lyx/text.cpp
@@ -1141,7 +1141,7 @@ void parse_box(Parser & p, ostream & os, unsigned outer_flags,
                os << "hor_pos \"" << hor_pos << "\"\n";
                if (outer_type == "mbox")
                        os << "has_inner_box 1\n";
-               else if (!frame_color.empty())
+               else if (!frame_color.empty() && inner_type == "makebox")
                        os << "has_inner_box 0\n";
                else
                        os << "has_inner_box " << !inner_type.empty() << "\n";