From 437d0d2b10d42ae741ae64feef56f9bf22797b38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20St=C3=B6hr?= Date: Wed, 20 May 2015 21:37:14 +0200 Subject: [PATCH] tex2lyx/text.cpp: a fix for \fboxcolor around \parbox and minipage --- src/tex2lyx/test/box-color-size-space-align.lyx.lyx | 4 ++-- src/tex2lyx/text.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) 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 d879302abe..2d5881efe9 100644 --- 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 3bfcc62736..664e2925d5 100644 --- 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";