four more ae symbols

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

diff --git a/lib/lyx2lyx/lyx_1_4.py b/lib/lyx2lyx/lyx_1_4.py
index 198f401cfefe28edf40e0a3cf92b6f5a9438cc3e..cd69f9f09a43920217b0be5362a5f657e9132e11 100644 (file)
--- a/lib/lyx2lyx/lyx_1_4.py
+++ b/lib/lyx2lyx/lyx_1_4.py
@@ -202,7 +202,7 @@ def revert_space_names(document):
 
 
 def lyx_support_escape(lab):
-    " Equivalent to lyx::support::escape()"
+    " Equivalent to pre-unicode lyx::support::escape()"
     hexdigit = ['0', '1', '2', '3', '4', '5', '6', '7',
                 '8', '9', 'A', 'B', 'C', 'D', 'E', 'F']
     enc = ""
@@ -313,7 +313,7 @@ def revert_external_1(document):
         params.reverse()
         if document.body[i+1]: del document.body[i+1]
 
-        document.body[i] = document.body[i] + " " + template[0]+ ', "' + filename[0] + '", " '+ "".join(params[1:]) + '"'
+        document.body[i] = document.body[i] + " " + template[0]+ ', "' + filename[0] + '", " '+ " ".join(params[1:]) + '"'
         i = i + 1
 
 
@@ -372,7 +372,7 @@ def convert_comment(document):
                         #but if this happens deal with it greacefully adding
                         #the missing \end_deeper.
                         i = len(document.body) - 1
-                        document.body[i:i] = ["\end_deeper",""]
+                        document.body[i:i] = ["\\end_deeper",""]
                         return
                     else:
                         del document.body[i]
@@ -714,7 +714,7 @@ parskip}
             vspace_top = document.body[i].find("\\added_space_top")
             tmp_list = document.body[i][vspace_top:].split()
             vspace_top_value = tmp_list[1]
-            document.body[i] = document.body[i][:vspace_top] + "".join(tmp_list[2:])
+            document.body[i] = document.body[i][:vspace_top] + " ".join(tmp_list[2:])
 
         if vspace_bot != -1:
             # the position could be change because of the removal of other
@@ -722,7 +722,7 @@ parskip}
             vspace_bot = document.body[i].find("\\added_space_bottom")
             tmp_list = document.body[i][vspace_bot:].split()
             vspace_bot_value = tmp_list[1]
-            document.body[i] = document.body[i][:vspace_bot] + "".join(tmp_list[2:])
+            document.body[i] = document.body[i][:vspace_bot] + " ".join(tmp_list[2:])
 
         document.body[i] = document.body[i].strip()
         i = i + 1
@@ -1863,7 +1863,7 @@ def convert_graphics(document):
             # We could use a heuristic and take the current directory,
             # and we could try to find out if documentname has an extension,
             # but that would be just guesses and could be wrong.
-            document.warning("""Warning: Can not determine whether document
+            document.warning("""Warning: Cannot determine whether document
          %s
          needs an extension when reading from standard input.
          You may need to correct the document manually or run