From: Juergen Spitzmueller <spitz@lyx.org>
Date: Sun, 27 Dec 2015 16:34:01 +0000 (+0100)
Subject: revert_tabularvalign: fix removal of tabularvalign feature tag
X-Git-Tag: 2.2.0beta1~305
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=106d89f7e6b445bff9509fb078cc248283ada10e;p=features.git

revert_tabularvalign: fix removal of tabularvalign feature tag
---

diff --git a/lib/lyx2lyx/lyx_2_0.py b/lib/lyx2lyx/lyx_2_0.py
index 6db4d21f27..3e6740db1d 100644
--- a/lib/lyx2lyx/lyx_2_0.py
+++ b/lib/lyx2lyx/lyx_2_0.py
@@ -89,10 +89,7 @@ def revert_tabularvalign(document):
       if p != -1:
           q = document.body[fline].find("tabularvalignment")
           if q != -1:
-              # FIXME
-              # This seems wrong: It removes everything after 
-              # tabularvalignment, too.
-              document.body[fline] = document.body[fline][:q - 1] + '>'
+              document.body[fline] = re.sub(r' tabularvalignment=\"[a-z]+\"', "", document.body[fline])
           i += 1
           continue
 
@@ -108,10 +105,7 @@ def revert_tabularvalign(document):
       # delete tabularvalignment
       q = document.body[fline].find("tabularvalignment")
       if q != -1:
-          # FIXME
-          # This seems wrong: It removes everything after 
-          # tabularvalignment, too.
-          document.body[fline] = document.body[fline][:q - 1] + '>'
+          document.body[fline] = re.sub(r' tabularvalignment=\"[a-z]+\"', "", document.body[fline])
 
       # don't add a box when centered
       if tabularvalignment == 'c':