Add support for CALS tables in DocBook.

[lyx.git] / lib / lyx2lyx / lyx_1_1_5.py

diff --git a/lib/lyx2lyx/lyx_1_1_5.py b/lib/lyx2lyx/lyx_1_1_5.py
index 001e959c1288e3698e7786cc7b928adbc0d272b4..6f553649d5413a2df727d7b6728ec33907c9abb7 100644 (file)
--- a/lib/lyx2lyx/lyx_1_1_5.py
+++ b/lib/lyx2lyx/lyx_1_1_5.py
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 """ Convert files to the file format generated by lyx 1.1.5"""
 
@@ -40,7 +40,7 @@ def replace_protected_separator(document):
     " Replace protected separator. "
     lines = document.body
     i=0
-    while 1:
+    while True:
         i = find_token(lines, "\\protected_separator", i)
         if i == -1:
             break
@@ -65,7 +65,7 @@ def merge_formula_inset(document):
     " Merge formula insets. "
     lines = document.body
     i=0
-    while 1:
+    while True:
         i = find_token(lines, "\\begin_inset Formula", i)
         if i == -1: break
         if lines[i+1] in math_env:
@@ -79,7 +79,7 @@ def update_tabular(document):
     lines = document.body
     lyxtable_re = re.compile(r".*\\LyXTable$")
     i=0
-    while 1:
+    while True:
         i = find_re(lines, lyxtable_re, i)
         if i == -1:
             break
@@ -99,7 +99,7 @@ def update_tabular(document):
             if len(col_info) == 3:
                 lines[i] = lines[i] + '"" ""'
             else:
-                lines[i] = "".join(col_info[:3]) + ' "%s" ""' % col_info[3]
+                lines[i] = " ".join(col_info[:3]) + ' "%s" ""' % col_info[3]
             i = i + 1
 
         while lines[i]:
@@ -111,7 +111,7 @@ def update_toc(document):
     " Update table of contents. "
     lines = document.body
     i = 0
-    while 1:
+    while True:
         i = find_token(lines,
                        '\\begin_inset LatexCommand \\tableofcontents', i)
         if i == -1:
@@ -158,7 +158,7 @@ def remove_space_in_units(document):
 
     for margin in margins:
         i = 0
-        while 1:
+        while True:
             i = find_token(lines, margin, i)
             if i == -1:
                 break
@@ -174,7 +174,7 @@ def latexdel_getargs(document, i):
     lines = document.body
 
     # play safe, clean empty lines
-    while 1:
+    while True:
         if lines[i]:
             break
         del lines[i]
@@ -187,11 +187,11 @@ def latexdel_getargs(document, i):
         document.warning("Unexpected end of inset.")
     j = find_token(lines, '\\begin_inset LatexDel }{', i)
 
-    ref = "".join(lines[i:j])
+    ref = " ".join(lines[i:j])
     del lines[i:j + 1]
 
     # play safe, clean empty lines
-    while 1:
+    while True:
         if lines[i]:
             break
         del lines[i]
@@ -202,7 +202,7 @@ def latexdel_getargs(document, i):
     else:
         document.warning("Unexpected end of inset.")
     j = find_token(lines, '\\begin_inset LatexDel }', i)
-    label = "".join(lines[i:j])
+    label = " ".join(lines[i:j])
     del lines[i:j + 1]
 
     return ref, label
@@ -212,7 +212,7 @@ def update_ref(document):
     " Update reference inset. "
     lines = document.body
     i = 0
-    while 1:
+    while True:
         i = find_token(lines, '\\begin_inset LatexCommand', i)
         if i == -1:
             return
@@ -230,7 +230,7 @@ def update_latexdel(document):
     lines = document.body
     i = 0
     latexdel_re = re.compile(r".*\\begin_inset LatexDel")
-    while 1:
+    while True:
         i = find_re(lines, latexdel_re, i)
         if i == -1:
             return