Attached are my versions of the configure.py patch. I use r""" """ to
improve readability. I also replace  \t with spaces in the original
1.5 patch, which is not allowed now.

Please confirm that they still work under windows.
Bo
Index: lib/configure.py
===================================================================
--- lib/configure.py	(revision 14333)
+++ lib/configure.py	(working copy)
@@ -636,8 +636,12 @@
   tex_allows_spaces = 'false'
   if lyx_check_config:
     print "Checking whether TeX allows spaces in file names... ",
-    writeToFile('a b.tex', r'\nonstopmode\message{working^^J}' )
-    if ''.join(cmdOutput(LATEX + ' "a b"')).find('working') != -1:
+    writeToFile('a b.tex', r'\message{working^^J}' )
+    if os.name == 'nt':
+      latex_out = cmdOutput(LATEX + r""" "\nonstopmode\input{\"a b\"}" """)
+    else:
+      latex_out = cmdOutput(LATEX + r""" '\nonstopmode\input{"a b"}' """)
+    if 'working' in latex_out:
       print 'yes'
       tex_allows_spaces = 'true'
     else:
Index: lib/configure.py
===================================================================
--- lib/configure.py	(revision 14333)
+++ lib/configure.py	(working copy)
@@ -640,8 +640,12 @@
     tex_allows_spaces = 'false'
     if lyx_check_config:
         print "Checking whether TeX allows spaces in file names... ",
-        writeToFile('a b.tex', r'\nonstopmode\message{working^^J}' )
-        if ''.join(cmdOutput(LATEX + ' "a b"')).find('working') != -1:
+        writeToFile('a b.tex', r'\message{working^^J}' )
+        if os.name == 'nt':
+            latex_out = cmdOutput(LATEX + r""" "\nonstopmode\input{\"a b\"}" """)
+        else:
+            latex_out = cmdOutput(LATEX + r""" '\nonstopmode\input{"a b"}' """)
+        if 'working' in latex_out:
             print 'yes'
             tex_allows_spaces = 'true'
         else:

Reply via email to