From c282f4e9db3ae3a22b4c1a53139b3c5a28a82014 Mon Sep 17 00:00:00 2001
From: Richard Heck <rgheck@comcast.net>
Date: Fri, 5 Nov 2010 19:51:06 +0000
Subject: [PATCH] Remove use_makebox option from other boxes, too.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36135 a592a061-630c-0410-9148-cb99ea01b6c8
---
 lib/lyx2lyx/lyx_2_0.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/lib/lyx2lyx/lyx_2_0.py b/lib/lyx2lyx/lyx_2_0.py
index 1d7c8b7d72..66d73f84e3 100644
--- a/lib/lyx2lyx/lyx_2_0.py
+++ b/lib/lyx2lyx/lyx_2_0.py
@@ -25,7 +25,8 @@ import sys, os
 
 from parser_tools import find_token, find_end_of, find_tokens, \
   find_end_of_inset, find_end_of_layout, find_token_backwards, \
-  is_in_inset, get_value, get_quoted_value, del_token
+  is_in_inset, get_value, get_quoted_value, del_token, \
+  check_token
   
 from lyx2lyx_tools import add_to_preamble, insert_to_preamble, \
   put_cmd_in_ert, lyx2latex, latex_length, revert_flex_inset, \
@@ -1412,10 +1413,9 @@ def revert_makebox(document):
   " Convert \\makebox to TeX code "
   i = 0
   while 1:
-    # only revert frameless boxes without an inner box
-    i = find_token(document.body, '\\begin_inset Box Frameless', i)
+    i = find_token(document.body, '\\begin_inset Box', i)
     if i == -1:
-      return
+      break
     z = find_end_of_inset(document.body, i)
     if z == -1:
       document.warning("Malformed LyX document: Can't find end of box inset.")
@@ -1432,8 +1432,9 @@ def revert_makebox(document):
     if j == -1:
         i = z
         continue
-    val = get_value(document.body, 'use_makebox', j)
-    if val != "1":
+    
+    if not check_token(document.body[i], "\\begin_inset Box Frameless") \
+      or get_value(document.body, 'use_makebox', j) != 1:
         del document.body[j]
         i = z
         continue
-- 
2.39.2