From: José Matox <jamatos@lyx.org>
Date: Fri, 9 Sep 2005 15:23:09 +0000 (+0000)
Subject: fix vertical alignment convertion for tables in format 216.
X-Git-Tag: 1.6.10~13931
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=568ae274e5fe2bdb2a11a7d5763a7398e9e6f11d;p=features.git

fix vertical alignment convertion for tables in format 216.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10434 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/lib/lyx2lyx/ChangeLog b/lib/lyx2lyx/ChangeLog
index 6ceb33b72a..031a3535e3 100644
--- a/lib/lyx2lyx/ChangeLog
+++ b/lib/lyx2lyx/ChangeLog
@@ -1,3 +1,7 @@
+2005-09-09  José Matos  <jamatos@lyx.org>
+
+	* lyx_1_1_6fix3.py (update_tabular): fix vertical alignment convertion.
+
 2005-08-28  Georg Baum  <Georg.Baum@post.rwth-aachen.de>
 
 	* lyx_1_4.py (convert_vspace): rename to revert_breaks and revert
diff --git a/lib/lyx2lyx/lyx_1_1_6fix3.py b/lib/lyx2lyx/lyx_1_1_6fix3.py
index df8f3d25be..bc5f9e6c01 100644
--- a/lib/lyx2lyx/lyx_1_1_6fix3.py
+++ b/lib/lyx2lyx/lyx_1_1_6fix3.py
@@ -27,6 +27,7 @@ def bool_table(item):
     return "true"
 
 
+align_vertical = {"0": "top", "1": "bottom", "2": "center"}
 align_table = {"0": "top", "2": "left", "4": "right", "8": "center"}
 use_table = {"0": "none", "1": "parbox"}
 table_meta_re = re.compile(r'<LyXTabular version="?1"? rows="?(\d*)"? columns="?(\d*)"?>')
@@ -95,7 +96,7 @@ def table_update(lines):
         res = cell_re.match(lines[i])
         if res:
             val = res.groups()
-            lines[i] = '<cell multicolumn="%s" alignment="%s" valignment="%s" topline="%s" bottomline="%s" leftline="%s" rightline="%s" rotate="%s" usebox="%s" width="%s" special="%s">' % ( val[0], align_table[val[1]], align_table[val[2]], bool_table(val[3]), bool_table(val[4]), bool_table(val[5]), bool_table(val[6]), bool_table(val[7]), use_table[val[8]], val[9], val[10])
+            lines[i] = '<cell multicolumn="%s" alignment="%s" valignment="%s" topline="%s" bottomline="%s" leftline="%s" rightline="%s" rotate="%s" usebox="%s" width="%s" special="%s">' % ( val[0], align_table[val[1]], align_vertical[val[2]], bool_table(val[3]), bool_table(val[4]), bool_table(val[5]), bool_table(val[6]), bool_table(val[7]), use_table[val[8]], val[9], val[10])
 
         res = row_re.match(lines[i])
         if res:
@@ -110,7 +111,7 @@ def table_update(lines):
         if res:
             val = res.groups()
             col_info[i] = '<column alignment="%s" valignment="%s" leftline="%s" rightline="%s" width="%s" special="%s">' \
-                          % ( align_table[val[0]], align_table[val[1]], bool_table(val[2]), bool_table(val[3]), val[4],val[5])
+                          % ( align_table[val[0]], align_vertical[val[1]], bool_table(val[2]), bool_table(val[3]), val[4],val[5])
 
     return lines[:2] + col_info + lines[2:]